diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl
index 4f4e7d133..a4bba7cef 100644
--- a/admin/themes/default/template/user_list.tpl
+++ b/admin/themes/default/template/user_list.tpl
@@ -856,7 +856,7 @@ $(document).ready(function() {
       <div class="edit-username-success" style="display: none;">
         <div class="update-username-success icon-green">
           <span class="icon-ok"></span>
-          <span>{'Username successfully modified'|@translate}</span>
+          <span>{'Username successfully modified'|@translate|escape}</span>
         </div>
         <p class="edit-username-success-ok"><span class="icon-button icon-ok" id="close_username_success">{'Ok'|@translate}</span></p>
       </div>
@@ -869,9 +869,9 @@ $(document).ready(function() {
 
       <div class="user-property-password-choice">
         <div class="password-choice-content">
-          <p class="head-button-2" id="copy_password_link"><span class="icon-link-1"></span> {'Copy the password link'|@translate}</p>
-          <p class="head-button-2" id="send_password_link"><span class="icon-mail-alt"></span> {'Resend password link'|@translate}</p>
-          <p class="head-button-2" id="edit_modal_password"><span class="icon-pencil"></span> {'Change password'|@translate}</p>
+          <p class="head-button-2" id="copy_password_link"><span class="icon-link-1"></span> {'Copy the password link'|@translate|escape}</p>
+          <p class="head-button-2" id="send_password_link"><span class="icon-mail-alt"></span> {'Resend password link'|@translate|escape}</p>
+          <p class="head-button-2" id="edit_modal_password"><span class="icon-pencil"></span> {'Change password'|@translate|escape}</p>
         </div>
         <p class="edit-password-cancel">{'Cancel'|@translate}</p>
       </div>
@@ -935,7 +935,7 @@ $(document).ready(function() {
     <div class="user-property-main-user-content">
       <div class="user-property-main-user-content-header">
         <span class="icon-king main-user-icon"></span>
-        <span class="main-user-title">{'Changing the main user'|@translate}</span>
+        <span class="main-user-title">{'Changing the main user'|@translate|escape}</span>
       </div>
 
       <div class="user-property-main-user-body">
@@ -943,12 +943,12 @@ $(document).ready(function() {
           <span class="main-user-proceed-desc">{'You are about to set %s as main user instead of %s, do you wish to continue?'|@translate}</span>
           <div class="main-user-proceed-footer">
             <span class="user-property-main-user-cancel">{'Cancel'|@translate}</span>
-            <span class="head-button-2 main-user-btn-proceed"><span class="icon-right">{'Yes, let\'s proceed'|@translate}</span></span>
+            <span class="head-button-2 main-user-btn-proceed"><span class="icon-right">{'Yes, let\'s proceed'|@translate|escape}</span></span>
           </div>
         </div>
 
         <div class="main-user-rewrite" style="display: none;">
-          <span class="main-user-rewrite-desc">{'To be sure, please rewrite the word “%s” below'|@translate} :</span>
+          <span class="main-user-rewrite-desc">{'To be sure, please rewrite the word “%s” below'|@translate|escape} :</span>
           <div class="main-user-rewrite-footer">
             <input type="text" id="main_user_rewrite" />
             <span id="main_user_rewrite_icon"></span>
@@ -956,7 +956,7 @@ $(document).ready(function() {
         </div>
 
         <div class="main-user-validate" style="display: none;">
-          <span class="main-user-validate-desc">{'You can now change the main user from %s to %s.'|@translate}</span>
+          <span class="main-user-validate-desc">{'You can now change the main user from %s to %s.'|@translate|escape}</span>
           <div class="main-user-validate-footer">
             <span class="user-property-main-user-cancel">{'Cancel'|@translate}</span>
             <span class="main-user-btn-validate"><span class="icon-floppy"></span> {'Validate'|@translate}</span>
@@ -966,7 +966,7 @@ $(document).ready(function() {
         <div class="main-user-success" style="display: none;">
           <div class="update-main-user-success icon-green">
             <span class="icon-ok"></span>
-            <span class="main-user-success-desc">{'%s is the new main user'|@translate}</span>
+            <span class="main-user-success-desc">{'%s is the new main user'|@translate|escape}</span>
           </div>
           <span class="user-property-main-user-close"><span class="icon-button icon-ok" id="main_user_success_close">{'Ok'|@translate}</span></span>
         </div>
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 838e79ee0..5cd1bf07d 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -1377,4 +1377,27 @@ $lang['First choose an album, then add your files'] = 'First choose an album, th
 $lang['Select or create an album'] = 'Select or create an album';
 $lang['List'] = 'List';
 $lang['Added on %s'] = 'Added on %s';
+$lang['Main user'] = 'Main user';
+$lang['The passwords do not match'] = 'The passwords do not match';
+$lang['Please complete all fields'] = 'Please complete all fields';
+$lang['Password copied'] = 'Password copied';
+$lang['Copy password'] = 'Copy password';
+$lang['Cannot send an email to this user because he doesn\'t have an email address'] = 'Cannot send an email to this user because he doesn\'t have an email address';
+$lang['You are about to set %s as main user instead of %s, do you wish to continue ?'] = 'You are about to set %s as main user instead of %s, do you wish to continue ?';
+$lang['To be sure, please rewrite the word “%s” below'] = 'To be sure, please rewrite the word “%s” below';
+$lang['You can now change the main user from %s to %s.'] = 'You can now change the main user from %s to %s.';
+$lang['%s is the new main user'] = '%s is the new main user';
+$lang['You are not authorised to change the main user, please ask your webmaster'] = 'You are not authorised to change the main user, please ask your webmaster';
+$lang['Set as main user'] = 'Set as main user';
+$lang['This user must first be defined as the webmaster before it can be upgraded to the main user'] = 'This user must first be defined as the webmaster before it can be upgraded to the main user';
+$lang['Copied link'] = 'Copied link';
+$lang['You cannot copy the password if the connection to this site is not secure.'] = 'You cannot copy the password if the connection to this site is not secure.';
+$lang['An activation link valid for 1 hour has been sent to "%s". If the user doesn\'t receive the link, you can generate and copy a new one by editing the user and managing her password.'] = 'An activation link valid for 1 hour has been sent to "%s". If the user doesn\'t receive the link, you can generate and copy a new one by editing the user and managing her password.';
+$lang['Copy the link below and send it to the user so the password can be set.'] = 'Copy the link below and send it to the user so the password can be set.';
+$lang['An activation link valid for 1 hour was created but could not be sent. You can now copy the link below and send it to the user.'] = 'An activation link valid for 1 hour was created but could not be sent. You can now copy the link below and send it to the user.';
+$lang['Copy the password link'] = 'Copy the password link';
+$lang['Resend password link'] = 'Resend password link';
+$lang['Username successfully modified'] = 'Username successfully modified';
+$lang['Changing the main user'] = 'Changing the main user';
+$lang['Yes, let\'s proceed'] = 'Yes, let\'s proceed';
 // Leave this line empty
\ No newline at end of file
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 07d1c20e7..728bc8e26 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -1379,4 +1379,27 @@ $lang['First choose an album, then add your files'] = 'Choisissez d\'abord un al
 $lang['Select or create an album'] = 'Sélectionner ou créer un album';
 $lang['List'] = 'Liste';
 $lang['Added on %s'] = 'Ajouté le %s';
+$lang['Main user'] = 'Utilisateur principal';
+$lang['The passwords do not match'] = 'Les mots de passe ne correspondent pas';
+$lang['Please complete all fields'] = 'Veuillez remplir tous les champs';
+$lang['Password copied'] = 'Mot de passe copié';
+$lang['Copy password'] = 'Copier le mot de passe';
+$lang['Cannot send an email to this user because he doesn\'t have an email address'] = 'Impossible d\'envoyer un e-mail à cet utilisateur car il n\'a pas d\'adresse e-mail';
+$lang['You are about to set %s as main user instead of %s, do you wish to continue ?'] = 'Vous êtes sur le point de définir %s comme utilisateur principal à la place de %s, souhaitez-vous continuer ?';
+$lang['To be sure, please rewrite the word “%s” below'] = 'Pour vous en assurer, veuillez réécrire le mot « %s » ci-dessous';
+$lang['You can now change the main user from %s to %s.'] = 'Vous pouvez maintenant changer l\'utilisateur principal de %s à %s.';
+$lang['%s is the new main user'] = '%s est le nouvel utilisateur principal';
+$lang['You are not authorised to change the main user, please ask your webmaster'] = 'Vous n\'êtes pas autorisé à changer l\'utilisateur principal, veuillez demander à votre webmaster';
+$lang['Set as main user'] = 'Définir comme utilisateur principal';
+$lang['This user must first be defined as the webmaster before it can be upgraded to the main user'] = 'Cet utilisateur doit d\'abord être défini en tant que webmaster avant de pouvoir devenir l\'utilisateur principal';
+$lang['Copied link'] = 'Lien copié';
+$lang['You cannot copy the password if the connection to this site is not secure.'] = 'Vous ne pouvez pas copier le mot de passe si la connexion à ce site n\'est pas sécurisée.';
+$lang['An activation link valid for 1 hour has been sent to "%s". If the user doesn\'t receive the link, you can generate and copy a new one by editing the user and managing her password.'] = 'Un lien d\'activation valable 1 heure a été envoyé à « %s ». Si l\'utilisateur ne reçoit pas le lien, vous pouvez en générer et en copier un nouveau en éditant l\'utilisateur et en gérant son mot de passe.';
+$lang['Copy the link below and send it to the user so the password can be set.'] = 'Copiez le lien ci-dessous et envoyez-le à l\'utilisateur pour qu\'il définisse son mot de passe.';
+$lang['An activation link valid for 1 hour was created but could not be sent. You can now copy the link below and send it to the user.'] = 'Un lien d\'activation valable 1 heure a été créé mais n\'a pas pu être envoyé. Vous pouvez maintenant copier le lien ci-dessous et l\'envoyer à l\'utilisateur.';
+$lang['Copy the password link'] = 'Copier le lien du mot de passe';
+$lang['Resend password link'] = 'Renvoyer le lien du mot de passe';
+$lang['Username successfully modified'] = 'Nom d\'utilisateur modifié avec succès';
+$lang['Changing the main user'] = 'Changer l\'utilisateur principal';
+$lang['Yes, let\'s proceed'] = 'Oui, continuons';
 // Leave this line empty