Pages with template setting "Disable multi-language support" still have the language name prepended in url

[oscarale]

Hello, I have a multi-language site that has static content which differs between each language, so I have disabled multi-language support in each template's settings, except for one, the contact page, that is using FrontendForms so I found I needed to use the multi-language support to get that page translated. My issue is that when I start to navigate away from that page, I now have the languages prefix in the url, regardless of whether or not the page's template has the multi-language support disabled or not. Is there a way to remove that prefix for pages that have this setting disabled?

For reference, here is my (simplified) page structure with urls

• Home (Language picker) | "example.com"
  • English US Content | "example.com/en-us"
  • English UK Content | "example.com/en-uk"
  • Spanish ES Content | "example.com/es-es"
  • Contact (PW Multi-language in english and spanish) | "example.com/contact" & "example.com/es/contacto"

Now let's say I follow this navigation path:

1. Home | "example.com"
2. Choose spanish content | "example.com/es-es"
3. Click on contact form link | "example.com/es/contacto"
4. Fill out and send form, click on link to go back home | "example.com/es"
5. Navigate to english content | "example.com/es/en-us"

I now have my url as "example.com/es/en-us" instead of "example.com/en-us". The page works, but it's just slightly annoying and confusing that this is in the url now. How could I remove this?

Thanks!

Edited April 8 by oscarale