diff --git a/Step.Utils/languages/IT.xml b/Step.Utils/languages/IT.xml
index 51da72d0..bf045ae3 100644
--- a/Step.Utils/languages/IT.xml
+++ b/Step.Utils/languages/IT.xml
@@ -546,6 +546,32 @@
   <alarm_history_filter_plc>PLC</alarm_history_filter_plc>
 
 
+  <!-- Users Manager --> 
+  <create_user_lbl_title_window>Modifica utente</create_user_lbl_title_window>
+  <create_user_lbl_firstname>Nome</create_user_lbl_firstname>
+  <create_user_lbl_lastname>Cognome</create_user_lbl_lastname>
+  <create_user_lbl_password>Password</create_user_lbl_password>
+  <create_user_lbl_username>Username</create_user_lbl_username>
+  <create_user_btn_add_confirm>Aggiungi</create_user_btn_add_confirm>
+  <create_user_btn_edit_confirm>Modifica</create_user_btn_edit_confirm>
+  <create_user_btn_cancel>Annulla</create_user_btn_cancel>  
+  <create_user_psw_not_equals>Le password devono combaciare</create_user_psw_not_equals>  
+  <password_user_lbl_actpassword>Password attuale</password_user_lbl_actpassword>
+  <password_user_lbl_newpassword>Password nuova</password_user_lbl_newpassword>
+  <password_user_lbl_title_window>Modifica password: %s</password_user_lbl_title_window>
+  <role_user_lbl_title_window>Modifica ruolo: %s</role_user_lbl_title_window>  
+  <modal_confirm_delete_user>Sei sicuro di voler eliminare l'utente?</modal_confirm_delete_user>  
+  <users_label_create_users>Aggiungi un nuovo utente</users_label_create_users>  
+  <users_header_title>Gestione Utenti</users_header_title>
+  <users_header_label_userfilter>Filtra utenti per Username</users_header_label_userfilter>
+  <users_header_label_userfilter_placeholder>Username...</users_header_label_userfilter_placeholder>
+  <users_table_header_avatar>Avatar</users_table_header_avatar>  
+  <users_table_header_username>Username</users_table_header_username>  
+  <users_table_header_firstname>Nome</users_table_header_firstname> 
+  <users_table_header_lastname>Cognome</users_table_header_lastname>   
+  <users_table_header_language>Lingua</users_table_header_language>  
+  <users_table_header_role>Ruolo</users_table_header_role>  
+
   <!-- /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\ Tooltips /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\ -->
   <!-- Footer -->
   <footer_tooltip_production>Manager della produzione</footer_tooltip_production>
@@ -557,6 +583,7 @@
   <footer_tooltip_scada>Pagine Scada</footer_tooltip_scada>
   <footer_tooltip_under_hood>Apre/Chiude area sotto-il-cofano</footer_tooltip_under_hood>
   <footer_tooltip_job_editor>Job Editor</footer_tooltip_job_editor>
+  <footer_tooltip_users>User Manager</footer_tooltip_users>
   
   <!-- Header -->
   <header_tooltip_btn_close>Chiudi CMS-Step</header_tooltip_btn_close>
diff --git a/Step.Utils/languages/en.xml b/Step.Utils/languages/en.xml
index 4d3f92c0..f96901ce 100644
--- a/Step.Utils/languages/en.xml
+++ b/Step.Utils/languages/en.xml
@@ -543,7 +543,32 @@
   <alarm_history_filter_nc>NC</alarm_history_filter_nc>
   <alarm_history_filter_plc>PLC</alarm_history_filter_plc>
 
-
+  <!-- Users Manager --> 
+  <create_user_lbl_title_window>User Editor</create_user_lbl_title_window>
+  <create_user_lbl_firstname>First Name</create_user_lbl_firstname>
+  <create_user_lbl_lastname>Last Name</create_user_lbl_lastname>
+  <create_user_lbl_password>Password</create_user_lbl_password>
+  <create_user_lbl_username>Username</create_user_lbl_username>
+  <create_user_btn_add_confirm>Add</create_user_btn_add_confirm>
+  <create_user_btn_edit_confirm>Edit</create_user_btn_edit_confirm>
+  <create_user_btn_cancel>Cancel</create_user_btn_cancel>  
+  <create_user_psw_not_equals>Passwords must be the same</create_user_psw_not_equals>  
+  <password_user_lbl_actpassword>Actual password</password_user_lbl_actpassword>
+  <password_user_lbl_newpassword>New password</password_user_lbl_newpassword>
+  <password_user_lbl_title_window>Password Editor: %s</password_user_lbl_title_window>
+  <role_user_lbl_title_window>Role Editor: %s</role_user_lbl_title_window>  
+  <modal_confirm_delete_user>Are you sure to delete the user?</modal_confirm_delete_user>  
+  <users_label_create_users>Add new user</users_label_create_users>  
+  <users_header_title>Users Manager</users_header_title>
+  <users_header_label_userfilter>Filter users by Username</users_header_label_userfilter>
+  <users_header_label_userfilter_placeholder>Username...</users_header_label_userfilter_placeholder>
+  <users_table_header_avatar>Avatar</users_table_header_avatar>  
+  <users_table_header_username>Username</users_table_header_username>  
+  <users_table_header_firstname>First Name</users_table_header_firstname> 
+  <users_table_header_lastname>Last Name</users_table_header_lastname>   
+  <users_table_header_language>Language</users_table_header_language>  
+  <users_table_header_role>Role</users_table_header_role>  
+  
   <!-- /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\ Tooltips /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\ -->
   <!-- Footer -->
   <footer_tooltip_production>Production Manager</footer_tooltip_production>
@@ -555,6 +580,7 @@
   <footer_tooltip_scada>Scada Pages</footer_tooltip_scada>
   <footer_tooltip_under_hood>Open/Close Under-the-hood Area</footer_tooltip_under_hood>
   <footer_tooltip_job_editor>Job Editor</footer_tooltip_job_editor>
+  <footer_tooltip_users>Users Manager</footer_tooltip_users>
   
   <!-- Header -->
   <header_tooltip_btn_close>Close CMS-Step</header_tooltip_btn_close>
diff --git a/Step/wwwroot/src/app_modules/users/components/users.vue b/Step/wwwroot/src/app_modules/users/components/users.vue
index ff6f4496..b0a06b6f 100644
--- a/Step/wwwroot/src/app_modules/users/components/users.vue
+++ b/Step/wwwroot/src/app_modules/users/components/users.vue
@@ -10,8 +10,8 @@
           <div class="users-body">            
               <div class="users-box-head">
                 <div>
-                  <label>{{'users_header_label_procedure' | localize("Ricerca utente per username")}}</label>
-                  <input class="custom users-input-procedure" v-model="searchText" type="text" @focus="extendSelectState = false" :placeholder="'users_header_label_procedure_placeholder' | localize('Username dell\'utente ...')">
+                  <label>{{'users_header_label_userfilter' | localize("Ricerca utente per username")}}</label>
+                  <input class="custom users-input-procedure" v-model="searchText" type="text" @focus="extendSelectState = false" :placeholder="'users_header_label_userfilter_placeholder' | localize('Username dell\'utente ...')">
                 </div>                
                 <div>
                   <label>&nbsp;</label>
@@ -34,9 +34,9 @@
                       <th>{{'users_table_header_avatar' | localize("Avatar")}}</th>
                       <th>{{'users_table_header_username' | localize("Username")}}</th>
                       <th>{{'users_table_header_firstname' | localize("Nome")}}</th>
-                      <th>{{'users_table_header_lasttname' | localize("Cognome")}}</th>
+                      <th>{{'users_table_header_lastname' | localize("Cognome")}}</th>
                       <th>{{'users_table_header_language' | localize("Lingua")}}</th>
-                      <th>{{'users_table_header_Role' | localize("Ruolo su questa macchina")}}</th>
+                      <th>{{'users_table_header_role' | localize("Ruolo su questa macchina")}}</th>
                     </tr>
                   </thead>
                   <tbody class="scrollable">
diff --git a/Step/wwwroot/src/modules/base-components/modal-password-user.vue b/Step/wwwroot/src/modules/base-components/modal-password-user.vue
index 3ead9bc3..ff8c1644 100644
--- a/Step/wwwroot/src/modules/base-components/modal-password-user.vue
+++ b/Step/wwwroot/src/modules/base-components/modal-password-user.vue
@@ -25,11 +25,11 @@
           </div> 
           <div class="divider">&nbsp;</div>
           <div class="title">
-              <label class="title_lbl">{{'password_user_lbl_password' | localize("Password attuale")}}</label>
+              <label class="title_lbl">{{'password_user_lbl_actpassword' | localize("Password attuale")}}</label>
               <input :type="pswVisible" v-validate.initial="{required: true}" v-model="newUser.password">
           </div>  
           <div class="title" >
-              <label class="title_lbl">{{'password_user_lbl_password' | localize("Password nuova")}}</label>
+              <label class="title_lbl">{{'password_user_lbl_newpassword' | localize("Password nuova")}}</label>
               <input :type="pswVisible" v-validate.initial="{required: true}" v-model="newUser.newPassword">
           </div>           
         </div>
@@ -40,7 +40,7 @@
       </div>
       <div class="pull-right">
         <button class="btn" @click="close()">{{'create_user_btn_cancel' | localize("Annulla")}}</button>
-        <button class="btn btn-success" :disabled="!isValid || !pswOk" @click="modify(newUser)">{{'create_user_btn_add_confirm' | localize("Conferma")}}</button>
+        <button class="btn btn-success" :disabled="!isValid || !pswOk" @click="modify(newUser)">{{'create_user_btn_edit_confirm' | localize("Conferma")}}</button>
       </div>
     </footer>
   </modal>
diff --git a/Step/wwwroot/src/modules/base-components/modal-role-user.vue b/Step/wwwroot/src/modules/base-components/modal-role-user.vue
index b85d559b..65aad54f 100644
--- a/Step/wwwroot/src/modules/base-components/modal-role-user.vue
+++ b/Step/wwwroot/src/modules/base-components/modal-role-user.vue
@@ -23,7 +23,7 @@
     <footer>
       <div class="pull-right">
         <button class="btn" @click="close()">{{'create_user_btn_cancel' | localize("Annulla")}}</button>
-        <button class="btn btn-success" :disabled="!selectOk" @click="modify(newUser)">{{'create_user_btn_add_confirm' | localize("Conferma")}}</button>
+        <button class="btn btn-success" :disabled="!selectOk" @click="modify(newUser)">{{'create_user_btn_edit_confirm' | localize("Conferma")}}</button>
       </div>
     </footer>
   </modal>