diff --git a/profile.php b/profile.php
index f8e0d4a84..928293d42 100644
--- a/profile.php
+++ b/profile.php
@@ -87,6 +87,16 @@ SELECT '.implode(',', $fields).'
     }
 
     $user['language'] = $_COOKIE['lang'];
+    single_update(
+      USER_INFOS_TABLE,
+      array(
+        'language' => $_COOKIE['lang']
+      ),
+      array(
+        'user_id' => $user['id']
+      )
+    );
+    
     load_language('common.lang', '', array('language'=>$user['language']));
   }
 
@@ -98,7 +108,7 @@ SELECT '.implode(',', $fields).'
 
   $template->assign(array(
     'language_options' => $language_options,
-    'current_language' => $user['language']
+    'language_selection' => $user['language']
   ));
 
   //Get link to doc
@@ -367,17 +377,6 @@ function load_profile_in_template($url_action, $url_redirect, $userdata, $templa
   $template->assign('template_selection', $userdata['theme']);
   $template->assign('template_options', get_pwg_themes());
 
-  foreach (get_languages() as $language_code => $language_name)
-  {
-    if (isset($_POST['submit']) or $userdata['language'] == $language_code)
-    {
-      $template->assign('language_selection', $language_code);
-    }
-    $language_options[$language_code] = $language_name;
-  }
-
-  $template->assign('language_options', $language_options);
-
   $special_user = in_array($userdata['id'], array($conf['guest_id'], $conf['default_user_id']));
   $template->assign('SPECIAL_USER', $special_user);
   $template->assign('IN_ADMIN', defined('IN_ADMIN'));
diff --git a/themes/standard_pages/template/profile.tpl b/themes/standard_pages/template/profile.tpl
index f3a91c1d3..f58d33c60 100644
--- a/themes/standard_pages/template/profile.tpl
+++ b/themes/standard_pages/template/profile.tpl
@@ -3,7 +3,7 @@
 {combine_css path="admin/themes/default/fontello/css/fontello.css" order=-11}
 
 <script>
-var selected_language = `{$language_options[$current_language]}`;
+  var selected_language = `{$language_options[$language_selection]}`;
   var url_logo_light = `{$ROOT_URL}themes/standard_pages/images/piwigo_logo.svg`;
   var url_logo_dark = `{$ROOT_URL}themes/standard_pages/images/piwigo_logo_dark.svg`;
 </script>
@@ -478,7 +478,7 @@ const str_must_not_empty = "{'must not be empty'|translate|escape:javascript}";
         </span>
         <div id="selected-language-container">
           <i class="gallery-icon-left-chevron"></i><span
-            id="selected-language">{$language_options[$current_language]}</span>
+            id="selected-language">{$language_options[$language_selection]}</span>
         </div>
       </div>
     </section>