diff --git a/frontend/public/us-US.png b/frontend/public/en-US.png
similarity index 100%
rename from frontend/public/us-US.png
rename to frontend/public/en-US.png
diff --git a/frontend/src/component/user/show-user-component.jsx b/frontend/src/component/user/show-user-component.jsx
index 4375f6bb5c..140f7af47d 100644
--- a/frontend/src/component/user/show-user-component.jsx
+++ b/frontend/src/component/user/show-user-component.jsx
@@ -11,24 +11,26 @@ export default class ShowUserComponent extends React.Component {
     };
     possibleLocales = [
         { value: 'nb-NO', image: 'nb-NO' },
-        { value: 'us-US', image: 'us-US' },
+        { value: 'en-US', image: 'en-US' },
         { value: 'en-GB', image: 'en-GB' },
     ];
 
     componentDidMount() {
         this.props.fetchUser();
         // find default locale and add it in choices if not present
-        let locale = navigator.language;
+        const locale = navigator.language || navigator.userLanguage;
         let found = this.possibleLocales.find(l => l.value === locale);
         if (!found) {
             this.possibleLocales.push({ value: locale, image: 'unknown-locale' });
         }
     }
 
+    getLocale() {
+        return (this.props.location && this.props.location.locale) || navigator.language || navigator.userLanguage;
+    }
+
     updateLocale() {
-        const locale = this.props.location
-            ? this.props.location.locale
-            : this.possibleLocales[this.possibleLocales.length - 1];
+        const locale = this.getLocale();
         let index = this.possibleLocales.findIndex(v => v.value === locale);
         index = (index + 1) % this.possibleLocales.length;
         this.props.updateSettingLocation('locale', this.possibleLocales[index].value);
@@ -36,9 +38,7 @@ export default class ShowUserComponent extends React.Component {
 
     render() {
         const email = this.props.profile ? this.props.profile.email : '';
-        const locale = this.props.location
-            ? this.props.location.locale
-            : this.possibleLocales[this.possibleLocales.length - 1].value;
+        const locale = this.getLocale();
         let foundLocale = this.possibleLocales.find(l => l.value === locale);
         const imageUrl = email ? this.props.profile.imageUrl : 'public/unknown-user.png';
         const imageLocale = foundLocale ? `public/${foundLocale.image}.png` : `public/unknown-locale.png`;