diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c
index 3e8f6fa..36a2a35 100644
--- a/source/ubl-settings-usergroups.c
+++ b/source/ubl-settings-usergroups.c
@@ -57,7 +57,7 @@ void yon_interface_update(main_window *widgets){
 				free(yon_char_divide(parameters[0],8));
 				char *login = yon_char_divide_search(parameters[i],"\"",-1);
 				login[strlen(login)-2]='\0';
-				if (!strcmp(parameters[1],"x")) parameters[1]=AUTOLIGIN_LABEL;
+				if (!strcmp(parameters[1],"x")) parameters[1]=AUTOMATICALLY_LABEL;
 				gtk_list_store_set(widgets->GroupsList,&iter,
 				1,login,
 				0,parameters_size>1?parameters[1]:"",
@@ -133,6 +133,7 @@ void on_groups_save(GtkWidget *self, dictionary *dict){
 
 void on_groups_clicked(GtkWidget *self, GtkEntry *output_target){
 	ubl_settings_usergroups_group_window *window = yon_ubl_settings_usergroups_group_new();
+	gtk_window_set_title(GTK_WINDOW(window->GroupsWindow),GROUPS_TITLE_LABEL);
 	GtkTreeIter iter, itar;
 	int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(main_config.groups_list),&iter);
 	for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(main_config.groups_list),&iter)){
@@ -176,6 +177,7 @@ void on_groups_multiple_save(GtkWidget *self, dictionary *dict){
 
 void on_groups_multiple_clicked(GtkWidget *self, GtkEntry *output_target){
 	ubl_settings_usergroups_group_window *window = yon_ubl_settings_usergroups_group_new();
+	gtk_window_set_title(GTK_WINDOW(window->GroupsWindow),GROUPS_TITLE_LABEL);
 	GtkTreeIter iter, itar;
 	int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(main_config.groups_list),&iter);
 	for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(main_config.groups_list),&iter)){
@@ -336,7 +338,7 @@ void on_ubl_settings_usergroups_additional_settings_open(GtkWidget *self, main_w
 
 void on_user_choose(GtkWidget *self, GtkEntry *target){
 	ubl_settings_usergroups_group_window *window = yon_ubl_settings_usergroups_group_new();
-	gtk_label_set_text(GTK_LABEL(window->HeaderLabel),)
+	gtk_label_set_text(GTK_LABEL(window->HeaderLabel),GROUP_USERS_TITLE_LABEL);
 	GtkTreeIter iter, itar;
 	int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(main_config.users_list),&iter);
 	for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(main_config.users_list),&iter)){
@@ -436,7 +438,7 @@ ubl_settings_usergroups_group_creation_window *yon_ubl_settings_usergroups_group
 	window->PasswordEntry=yon_gtk_builder_get_widget(builder,"PasswordEntry");
 	window->ChangePasswordButton=yon_gtk_builder_get_widget(builder,"ChangePasswordButton");
 
-	gtk_window_set_title(GTK_WINDOW(window->CreateGroupWindow),GROUP_TITLE_LABEL);
+	gtk_window_set_title(GTK_WINDOW(window->CreateGroupWindow),GROUPS_TITLE_LABEL);
 	dictionary *entry_dict=NULL;
 	yon_dictionary_add_or_create_if_exists_with_data(entry_dict,"combo",window->PasswordCombo);
 	yon_dictionary_add_or_create_if_exists_with_data(entry_dict,"entry",window->PasswordEntry);
@@ -507,6 +509,7 @@ void on_standard_groups_accept(GtkWidget *self, ubl_settings_usergroups_group_wi
 
 void on_standard_groups_open(GtkWidget *self, main_window *widgets){
     ubl_settings_usergroups_group_window *window = yon_ubl_settings_usergroups_group_new();
+	gtk_window_set_title(GTK_WINDOW(window->GroupsWindow),GROUPS_TITLE_LABEL);
 	GtkTreeIter iter, itar;
 	int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(main_config.groups_list),&iter);
 	for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(main_config.groups_list),&iter)){
@@ -1034,7 +1037,6 @@ ubl_settings_usergroups_user_window *yon_ubl_settings_usergroups_user_new(){
 	window->UseraddShutdownCheck=yon_gtk_builder_get_widget(builder,"UseraddShutdownCheck");
 	window->UsershadowBootCheck=yon_gtk_builder_get_widget(builder,"UsershadowBootCheck");
 	window->UsershadowShutdownCheck=yon_gtk_builder_get_widget(builder,"UsershadowShutdownCheck");
-	gtk_window_set_title(GTK_WINDOW(window->CreateUserWindow),USER_TITLE_LABEL);
 	
 	int shell_size=0;
 	config_str shells = yon_file_open(shell_list_path,&shell_size);
@@ -1081,6 +1083,7 @@ void on_main_add(GtkWidget *self, main_window *widgets){
 		model = GTK_TREE_MODEL(widgets->UsersList);
 		gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->UsersTree)));
 			ubl_settings_usergroups_user_window *window = yon_ubl_settings_usergroups_user_new();
+			gtk_window_set_title(GTK_WINDOW(window->CreateUserWindow),ADD_USER_TITLE_LABEL);
 			dictionary *dict = NULL;
 			yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
 			yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
@@ -1092,6 +1095,7 @@ void on_main_add(GtkWidget *self, main_window *widgets){
 		model = GTK_TREE_MODEL(widgets->GroupsList);
 		gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->GroupsTree)));
 			ubl_settings_usergroups_group_creation_window *window = yon_ubl_settings_usergroups_group_creation_new();
+			gtk_window_set_title(GTK_WINDOW(window->CreateGroupWindow),ADD_GROUP_TITLE_LABEL);
 			dictionary *dict = NULL;
 			yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
 			yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
@@ -1111,6 +1115,7 @@ void on_main_edit(GtkWidget *self, main_window *widgets){
 		model = GTK_TREE_MODEL(widgets->UsersList);
 		if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->UsersTree)),&model,&iter)){
 			ubl_settings_usergroups_user_window *window = yon_ubl_settings_usergroups_user_new();
+			gtk_window_set_title(GTK_WINDOW(window->CreateUserWindow),CONFIGURE_USER_TITLE_LABEL);
 			dictionary *dict = NULL;
 			yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
 			yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
@@ -1211,6 +1216,7 @@ void on_main_edit(GtkWidget *self, main_window *widgets){
 		model = GTK_TREE_MODEL(widgets->GroupsList);
 		if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->GroupsTree)),&model,&iter)){
 			ubl_settings_usergroups_group_creation_window *window = yon_ubl_settings_usergroups_group_creation_new();
+			gtk_window_set_title(GTK_WINDOW(window->CreateGroupWindow),CONFIGURE_GROUP_TITLE_LABEL);
 			dictionary *dict = NULL;
 			yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
 			yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index ece8f48..53747a8 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -39,7 +39,7 @@
 #define GROUPS_USERS_LABEL _("Group users")
 #define GROUPS_LABEL _("Groups")
 
-#define PASSWORD_TITLE_LABEL _("Users and groups - password")
+#define PASSWORD_TITLE_LABEL _("Password input")
 
 #define INSPECT_SYSTEM_LABEL _("Inspect users and groups in system")
 #define ADDITIONAL_SETTINGS_LABEL _("Additional settings")
@@ -50,7 +50,7 @@
 #define UPDATE_LABEL _("Update users and groups")
 
 //ubl-settings-usergroups-additional-settings.glade
-#define ADDITIONAL_SETTINGS_TITLE_LABEL _("Users and groups - additional settings")
+#define ADDITIONAL_SETTINGS_TITLE_LABEL _("Additional settings")
 #define NO_PASSWORD_LABEL _("No password required")
 #define SET_PASSWORD_LABEL _("Set a password")
 #define ENDRYPTED_LABEL _("Endrypted password")
@@ -69,7 +69,8 @@
 #define ACCEPT_LABEL _("Accept")
 
 //ubl-settings-usergroups-group-creation.glade
-#define GROUP_TITLE_LABEL _("Users and groups - group configuration")
+#define CONFIGURE_GROUP_TITLE_LABEL _("Configure group")
+#define ADD_GROUP_TITLE_LABEL _("Add group")
 #define GROUP_ID_LABEL _("Group id:")
 #define GROUP_CREATION_NAME_LABEL _("Group name:")
 #define GROUP_USERS_LABEL _("Group users:")
@@ -81,22 +82,11 @@
 #define ADDITIONAL_CONFIGURATION_LABEL _("Additional configuration")
 
 //ubl-settings-usergroups-group.glade
-#define GROUPS_TITLE_LABEL _("Users and groups - groups")
-#define GROUP_USERS_LABEL _("Users and groups - users")
-#define ADM_LABEL "adm"
-#define AUDIO_LABEL "audio"
-#define AUTOLIGIN_LABEL "autologin"
-#define AVAHI_LABEL "avahi"
-#define BIN_LABEL "bin"
-#define BRLAPI_LABEL "brlapi"
-#define BRITTY_LABEL "britty"
-#define BUMBLBEE_LABEL "bumblbee"
-#define CHRONY_LABEL "chrony"
-#define CLAMAV_LABEL "clamav"
-#define COLORD_LABEL "colord"
+#define GROUPS_TITLE_LABEL _("Choose groups")
+#define GROUP_USERS_TITLE_LABEL _("Choose users")
 
 //ubl-settings-usergroups-system.glade
-#define INSPECTOR_TITLE_LABEL _("Users and groups - system users and groups")
+#define INSPECTOR_TITLE_LABEL _("System users and groups")
 #define BLOCKED_LABEL _("Blocked")
 #define USERNAME_LABEL _("Username")
 #define PRIMARY_GROUP_LABEL _("Primary group")
@@ -117,7 +107,8 @@
 #define INTERVAL_MAX_TABLE_LABEL _("Password change interval (max)")
 
 //ubl-settings-usergroups-user.glade
-#define USER_TITLE_LABEL _("Users and groups - user configuration")
+#define ADD_USER_TITLE_LABEL _("Add user")
+#define CONFIGURE_USER_TITLE_LABEL _("Configure user")
 #define SET_LABEL _("Set")
 #define EMPTY_IMPORTANT_LABEL _("Empty important field")
 #define LOADING_FAILED_LABEL _("Loading has failed")
diff --git a/ubl-settings-usergroups-additional-settings.glade b/ubl-settings-usergroups-additional-settings.glade
index 40ceec4..19ba439 100644
--- a/ubl-settings-usergroups-additional-settings.glade
+++ b/ubl-settings-usergroups-additional-settings.glade
@@ -384,7 +384,7 @@
           <object class="GtkLabel">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">Users and groups - additional settings</property>
+            <property name="label" translatable="yes">Additional settings</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/ubl-settings-usergroups-group-creation.glade b/ubl-settings-usergroups-group-creation.glade
index 4a89d40..2348b54 100644
--- a/ubl-settings-usergroups-group-creation.glade
+++ b/ubl-settings-usergroups-group-creation.glade
@@ -411,7 +411,7 @@
           <object class="GtkLabel" id="userTitleNameLabel">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">Users and groups - group configuration</property>
+            <property name="label" translatable="yes">Add group</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/ubl-settings-usergroups-group.glade b/ubl-settings-usergroups-group.glade
index 6daf05e..052f4b4 100644
--- a/ubl-settings-usergroups-group.glade
+++ b/ubl-settings-usergroups-group.glade
@@ -171,7 +171,7 @@
           <object class="GtkLabel" id="HeaderLabel">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">Users and groups - groups</property>
+            <property name="label" translatable="yes">Choose groups</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/ubl-settings-usergroups-password.glade b/ubl-settings-usergroups-password.glade
index cc75bec..2a96f8d 100644
--- a/ubl-settings-usergroups-password.glade
+++ b/ubl-settings-usergroups-password.glade
@@ -279,7 +279,7 @@
           <object class="GtkLabel" id="userTitleNameLabel">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">Users and groups - password</property>
+            <property name="label" translatable="yes">Password input</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/ubl-settings-usergroups-system.glade b/ubl-settings-usergroups-system.glade
index c58c416..26ceded 100644
--- a/ubl-settings-usergroups-system.glade
+++ b/ubl-settings-usergroups-system.glade
@@ -417,7 +417,7 @@
           <object class="GtkLabel" id="webHeaderNameLabel">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">Users and groups - system users and groups</property>
+            <property name="label" translatable="yes">System users and groups</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/ubl-settings-usergroups-user.glade b/ubl-settings-usergroups-user.glade
index 792eaa4..41b9c9b 100644
--- a/ubl-settings-usergroups-user.glade
+++ b/ubl-settings-usergroups-user.glade
@@ -1227,7 +1227,7 @@
           <object class="GtkLabel" id="userTitleNameLabel">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="label" translatable="yes">Users and groups - user configuration</property>
+            <property name="label" translatable="yes">Add user</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/ubl-settings-usergroups.pot b/ubl-settings-usergroups.pot
index bcd0787..9e8b91a 100644
--- a/ubl-settings-usergroups.pot
+++ b/ubl-settings-usergroups.pot
@@ -105,7 +105,7 @@ msgstr ""
 msgid "UID"
 msgstr ""
 
-#: source/ubl-strings.h:15 source/ubl-strings.h:77
+#: source/ubl-strings.h:15 source/ubl-strings.h:78
 msgid "Login"
 msgstr ""
 
@@ -113,7 +113,7 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: source/ubl-strings.h:17 source/ubl-strings.h:144
+#: source/ubl-strings.h:17 source/ubl-strings.h:135
 msgid "User name"
 msgstr ""
 
@@ -198,14 +198,14 @@ msgid "Groups"
 msgstr ""
 
 #: source/ubl-strings.h:42
-msgid "Users and groups - password"
+msgid "Password input"
 msgstr ""
 
 #: source/ubl-strings.h:44
 msgid "Inspect users and groups in system"
 msgstr ""
 
-#: source/ubl-strings.h:45
+#: source/ubl-strings.h:45 source/ubl-strings.h:53
 msgid "Additional settings"
 msgstr ""
 
@@ -229,10 +229,6 @@ msgstr ""
 msgid "Update users and groups"
 msgstr ""
 
-#: source/ubl-strings.h:53
-msgid "Users and groups - additional settings"
-msgstr ""
-
 #: source/ubl-strings.h:54
 msgid "No password required"
 msgstr ""
@@ -250,248 +246,256 @@ msgid "Accept"
 msgstr ""
 
 #: source/ubl-strings.h:72
-msgid "Users and groups - group configuration"
+msgid "Configure group"
 msgstr ""
 
 #: source/ubl-strings.h:73
-msgid "Group id:"
+msgid "Add group"
 msgstr ""
 
 #: source/ubl-strings.h:74
-msgid "Group name:"
+msgid "Group id:"
 msgstr ""
 
 #: source/ubl-strings.h:75
-msgid "Group users:"
+msgid "Group name:"
 msgstr ""
 
 #: source/ubl-strings.h:76
+msgid "Group users:"
+msgstr ""
+
+#: source/ubl-strings.h:77
 msgid "Automatically"
 msgstr ""
 
-#: source/ubl-strings.h:78
+#: source/ubl-strings.h:79
 msgid "Create group with ununique GID"
 msgstr ""
 
-#: source/ubl-strings.h:79
+#: source/ubl-strings.h:80
 msgid "Create system group"
 msgstr ""
 
-#: source/ubl-strings.h:80
+#: source/ubl-strings.h:81
 msgid "Encrypted password"
 msgstr ""
 
-#: source/ubl-strings.h:81
+#: source/ubl-strings.h:82
 msgid "Additional configuration"
 msgstr ""
 
-#: source/ubl-strings.h:84
-msgid "Users and groups - groups"
+#: source/ubl-strings.h:85
+msgid "Choose groups"
 msgstr ""
 
-#: source/ubl-strings.h:85
-msgid "Users and groups - users"
+#: source/ubl-strings.h:86
+msgid "Choose users"
 msgstr ""
 
-#: source/ubl-strings.h:99
-msgid "Users and groups - system users and groups"
+#: source/ubl-strings.h:89
+msgid "System users and groups"
 msgstr ""
 
-#: source/ubl-strings.h:100
+#: source/ubl-strings.h:90
 msgid "Blocked"
 msgstr ""
 
-#: source/ubl-strings.h:101
+#: source/ubl-strings.h:91
 msgid "Username"
 msgstr ""
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:92
 msgid "Primary group"
 msgstr ""
 
-#: source/ubl-strings.h:103
+#: source/ubl-strings.h:93
 msgid "Home directory"
 msgstr ""
 
-#: source/ubl-strings.h:104 source/ubl-strings.h:110
+#: source/ubl-strings.h:94 source/ubl-strings.h:100
 msgid "Group"
 msgstr ""
 
-#: source/ubl-strings.h:105
+#: source/ubl-strings.h:95
 msgid "Update the system users and groups list"
 msgstr ""
 
-#: source/ubl-strings.h:106
+#: source/ubl-strings.h:96
 msgid "Toggle system groups and users"
 msgstr ""
 
-#: source/ubl-strings.h:108
+#: source/ubl-strings.h:98
 msgid "Password mismatch"
 msgstr ""
 
-#: source/ubl-strings.h:109
+#: source/ubl-strings.h:99
 msgid "Password must be at least"
 msgstr ""
 
-#: source/ubl-strings.h:109
+#: source/ubl-strings.h:99
 msgid "characters"
 msgstr ""
 
-#: source/ubl-strings.h:111
+#: source/ubl-strings.h:101
 msgid "Days until warning"
 msgstr ""
 
-#: source/ubl-strings.h:112
+#: source/ubl-strings.h:102
 msgid "Days without activity"
 msgstr ""
 
-#: source/ubl-strings.h:113
+#: source/ubl-strings.h:103
 msgid "Shell path"
 msgstr ""
 
-#: source/ubl-strings.h:114
+#: source/ubl-strings.h:104
 msgid "Password has been changed"
 msgstr ""
 
-#: source/ubl-strings.h:115
+#: source/ubl-strings.h:105
 msgid "Expiration date"
 msgstr ""
 
-#: source/ubl-strings.h:116
+#: source/ubl-strings.h:106
 msgid "Password change interval (min)"
 msgstr ""
 
-#: source/ubl-strings.h:117
+#: source/ubl-strings.h:107
 msgid "Password change interval (max)"
 msgstr ""
 
-#: source/ubl-strings.h:120
-msgid "Users and groups - user configuration"
+#: source/ubl-strings.h:110
+msgid "Add user"
 msgstr ""
 
-#: source/ubl-strings.h:121
+#: source/ubl-strings.h:111
+msgid "Configure user"
+msgstr ""
+
+#: source/ubl-strings.h:112
 msgid "Set"
 msgstr ""
 
-#: source/ubl-strings.h:122
+#: source/ubl-strings.h:113
 msgid "Empty important field"
 msgstr ""
 
-#: source/ubl-strings.h:123
+#: source/ubl-strings.h:114
 msgid "Loading has failed"
 msgstr ""
 
-#: source/ubl-strings.h:124
+#: source/ubl-strings.h:115
 msgid "Login name"
 msgstr ""
 
-#: source/ubl-strings.h:125
+#: source/ubl-strings.h:116
 msgid "Additional groups:"
 msgstr ""
 
-#: source/ubl-strings.h:126
+#: source/ubl-strings.h:117
 msgid "Password configuration"
 msgstr ""
 
-#: source/ubl-strings.h:127
+#: source/ubl-strings.h:118
 msgid "Password has been changed:"
 msgstr ""
 
-#: source/ubl-strings.h:128
+#: source/ubl-strings.h:119
 msgid "expiration date:"
 msgstr ""
 
-#: source/ubl-strings.h:129
+#: source/ubl-strings.h:120
 msgid "Password change interval: minimum"
 msgstr ""
 
-#: source/ubl-strings.h:130
+#: source/ubl-strings.h:121
 msgid "days, maximum"
 msgstr ""
 
-#: source/ubl-strings.h:131
+#: source/ubl-strings.h:122
 msgid "days"
 msgstr ""
 
-#: source/ubl-strings.h:132
+#: source/ubl-strings.h:123
 msgid "Days until warning:"
 msgstr ""
 
-#: source/ubl-strings.h:133
+#: source/ubl-strings.h:124
 msgid "Days without activity:"
 msgstr ""
 
-#: source/ubl-strings.h:134
+#: source/ubl-strings.h:125
 msgid "Force change at next login"
 msgstr ""
 
-#: source/ubl-strings.h:135
+#: source/ubl-strings.h:126
 msgid "User shell:"
 msgstr ""
 
-#: source/ubl-strings.h:136
+#: source/ubl-strings.h:127
 msgid "Home directory:"
 msgstr ""
 
-#: source/ubl-strings.h:137
+#: source/ubl-strings.h:128
 msgid "Don't set"
 msgstr ""
 
-#: source/ubl-strings.h:138
+#: source/ubl-strings.h:129
 msgid "Create system user"
 msgstr ""
 
-#: source/ubl-strings.h:139
+#: source/ubl-strings.h:130
 msgid "Create user with ununique (repeating) UID"
 msgstr ""
 
-#: source/ubl-strings.h:140
+#: source/ubl-strings.h:131
 msgid "Do not check login for compliance with character rules"
 msgstr ""
 
-#: source/ubl-strings.h:141
+#: source/ubl-strings.h:132
 msgid "Temporary deactivation"
 msgstr ""
 
-#: source/ubl-strings.h:142
+#: source/ubl-strings.h:133
 msgid "Save"
 msgstr ""
 
-#: source/ubl-strings.h:143
+#: source/ubl-strings.h:134
 msgid "login_name"
 msgstr ""
 
-#: source/ubl-strings.h:146
+#: source/ubl-strings.h:137
 msgid "System user synchronization mode with configuration"
 msgstr ""
 
-#: source/ubl-strings.h:147
+#: source/ubl-strings.h:138
 msgid "During system startup, load the user from the configuration"
 msgstr ""
 
-#: source/ubl-strings.h:148
+#: source/ubl-strings.h:139
 msgid "When shutting down the system, save the user into the configuration"
 msgstr ""
 
-#: source/ubl-strings.h:149
+#: source/ubl-strings.h:140
 msgid "The mode of synchronizing system user settings with the configuration"
 msgstr ""
 
-#: source/ubl-strings.h:150
+#: source/ubl-strings.h:141
 msgid ""
 "When the system boots up, load the user's settings from the configuration"
 msgstr ""
 
-#: source/ubl-strings.h:151
+#: source/ubl-strings.h:142
 msgid ""
 "When shutting down the system, save the user's settings into the "
 "configuration"
 msgstr ""
 
-#: source/ubl-strings.h:154
+#: source/ubl-strings.h:145
 msgid "Repeat password:"
 msgstr ""
 
-#: source/ubl-strings.h:155
+#: source/ubl-strings.h:146
 msgid "Password hash:"
 msgstr ""
diff --git a/ubl-settings-usergroups_ru.po b/ubl-settings-usergroups_ru.po
index e0d8655..d90a3d8 100644
--- a/ubl-settings-usergroups_ru.po
+++ b/ubl-settings-usergroups_ru.po
@@ -108,7 +108,7 @@ msgstr "Алгоритм хэширования пароля:"
 msgid "UID"
 msgstr "UID"
 
-#: source/ubl-strings.h:15 source/ubl-strings.h:77
+#: source/ubl-strings.h:15 source/ubl-strings.h:78
 msgid "Login"
 msgstr "Логин"
 
@@ -116,7 +116,7 @@ msgstr "Логин"
 msgid "Password"
 msgstr "Пароль"
 
-#: source/ubl-strings.h:17 source/ubl-strings.h:144
+#: source/ubl-strings.h:17 source/ubl-strings.h:135
 msgid "User name"
 msgstr "Имя пользователя"
 
@@ -201,15 +201,14 @@ msgid "Groups"
 msgstr "Группы"
 
 #: source/ubl-strings.h:42
-#, fuzzy
-msgid "Users and groups - password"
-msgstr "Пользователи и группы - группы"
+msgid "Password input"
+msgstr "Ввод пароля"
 
 #: source/ubl-strings.h:44
 msgid "Inspect users and groups in system"
 msgstr "Просмотр пользователей и групп в системе"
 
-#: source/ubl-strings.h:45
+#: source/ubl-strings.h:45 source/ubl-strings.h:53
 msgid "Additional settings"
 msgstr "Дополнительные настройки"
 
@@ -233,10 +232,6 @@ msgstr "Удалить"
 msgid "Update users and groups"
 msgstr "Обновить список пользователей и групп"
 
-#: source/ubl-strings.h:53
-msgid "Users and groups - additional settings"
-msgstr "Пользователи и группы - дополнительные настройки"
-
 #: source/ubl-strings.h:54
 msgid "No password required"
 msgstr "Пароль не требуется"
@@ -254,250 +249,258 @@ msgid "Accept"
 msgstr "Принять"
 
 #: source/ubl-strings.h:72
-msgid "Users and groups - group configuration"
-msgstr "Пользователи и группы - настройка группы"
+msgid "Configure group"
+msgstr "Редактировать группу"
 
 #: source/ubl-strings.h:73
+msgid "Add group"
+msgstr "Создать группу"
+
+#: source/ubl-strings.h:74
 msgid "Group id:"
 msgstr "ID Группы:"
 
-#: source/ubl-strings.h:74
+#: source/ubl-strings.h:75
 msgid "Group name:"
 msgstr "Имя группы:"
 
-#: source/ubl-strings.h:75
+#: source/ubl-strings.h:76
 msgid "Group users:"
 msgstr "Пользователи группы:"
 
-#: source/ubl-strings.h:76
+#: source/ubl-strings.h:77
 msgid "Automatically"
 msgstr "Автоматически"
 
-#: source/ubl-strings.h:78
+#: source/ubl-strings.h:79
 msgid "Create group with ununique GID"
 msgstr "Создать группу с повторяющимися (не уникальными) GID"
 
-#: source/ubl-strings.h:79
+#: source/ubl-strings.h:80
 msgid "Create system group"
 msgstr "Создать системную группу"
 
-#: source/ubl-strings.h:80
+#: source/ubl-strings.h:81
 msgid "Encrypted password"
 msgstr "Зашифрованный пароль"
 
-#: source/ubl-strings.h:81
+#: source/ubl-strings.h:82
 msgid "Additional configuration"
 msgstr "Загрузить локальную конфигуруцию"
 
-#: source/ubl-strings.h:84
-msgid "Users and groups - groups"
-msgstr "Пользователи и группы - группы"
-
 #: source/ubl-strings.h:85
-msgid "Users and groups - users"
-msgstr "Пользователи и группы - пользователи"
+msgid "Choose groups"
+msgstr "Выбрать группы"
 
-#: source/ubl-strings.h:99
-msgid "Users and groups - system users and groups"
-msgstr "Пользователи и группы - в системе"
+#: source/ubl-strings.h:86
+msgid "Choose users"
+msgstr "Выбрать пользователей"
+
+#: source/ubl-strings.h:89
+msgid "System users and groups"
+msgstr "Пользователи и группы в системе"
 
-#: source/ubl-strings.h:100
+#: source/ubl-strings.h:90
 msgid "Blocked"
 msgstr "Заблокировано"
 
-#: source/ubl-strings.h:101
+#: source/ubl-strings.h:91
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:92
 msgid "Primary group"
 msgstr "Основная группа"
 
-#: source/ubl-strings.h:103
+#: source/ubl-strings.h:93
 msgid "Home directory"
 msgstr "Домашний каталог"
 
-#: source/ubl-strings.h:104 source/ubl-strings.h:110
+#: source/ubl-strings.h:94 source/ubl-strings.h:100
 msgid "Group"
 msgstr "Группа"
 
-#: source/ubl-strings.h:105
+#: source/ubl-strings.h:95
 msgid "Update the system users and groups list"
 msgstr "Обновить список пользователей и групп системы"
 
-#: source/ubl-strings.h:106
+#: source/ubl-strings.h:96
 msgid "Toggle system groups and users"
 msgstr "Переключить видимость системных пользователей и групп"
 
-#: source/ubl-strings.h:108
+#: source/ubl-strings.h:98
 msgid "Password mismatch"
 msgstr "Несовпадение паролей"
 
-#: source/ubl-strings.h:109
+#: source/ubl-strings.h:99
 msgid "Password must be at least"
 msgstr "Пароль должен состоять из как минимум"
 
-#: source/ubl-strings.h:109
+#: source/ubl-strings.h:99
 msgid "characters"
 msgstr "символов"
 
-#: source/ubl-strings.h:111
+#: source/ubl-strings.h:101
 msgid "Days until warning"
 msgstr "Дней до предупреждения"
 
-#: source/ubl-strings.h:112
+#: source/ubl-strings.h:102
 msgid "Days without activity"
 msgstr "Дней без активности"
 
-#: source/ubl-strings.h:113
+#: source/ubl-strings.h:103
 msgid "Shell path"
 msgstr "Путь до оболочки"
 
-#: source/ubl-strings.h:114
+#: source/ubl-strings.h:104
 msgid "Password has been changed"
 msgstr "Пароль изменён"
 
-#: source/ubl-strings.h:115
+#: source/ubl-strings.h:105
 msgid "Expiration date"
 msgstr "Дата устаревания"
 
-#: source/ubl-strings.h:116
+#: source/ubl-strings.h:106
 msgid "Password change interval (min)"
 msgstr "Интервал смены пароля (мин.)"
 
-#: source/ubl-strings.h:117
+#: source/ubl-strings.h:107
 msgid "Password change interval (max)"
 msgstr "Интервал смены пароля (макс.)"
 
-#: source/ubl-strings.h:120
-msgid "Users and groups - user configuration"
-msgstr "Пользователи и группы - настройка пользователя"
+#: source/ubl-strings.h:110
+msgid "Add user"
+msgstr "Создать пользователя"
 
-#: source/ubl-strings.h:121
+#: source/ubl-strings.h:111
+msgid "Configure user"
+msgstr "Редактировать пользователя"
+
+#: source/ubl-strings.h:112
 msgid "Set"
 msgstr "Задать"
 
-#: source/ubl-strings.h:122
+#: source/ubl-strings.h:113
 msgid "Empty important field"
 msgstr "Пустое важное поле"
 
-#: source/ubl-strings.h:123
+#: source/ubl-strings.h:114
 msgid "Loading has failed"
 msgstr "Ошибка загрузки"
 
-#: source/ubl-strings.h:124
+#: source/ubl-strings.h:115
 msgid "Login name"
 msgstr "Имя логина"
 
-#: source/ubl-strings.h:125
+#: source/ubl-strings.h:116
 msgid "Additional groups:"
 msgstr "Дополнительные группы:"
 
-#: source/ubl-strings.h:126
+#: source/ubl-strings.h:117
 msgid "Password configuration"
 msgstr "Конфигурация пароля"
 
-#: source/ubl-strings.h:127
+#: source/ubl-strings.h:118
 msgid "Password has been changed:"
 msgstr "Пароль изменён:"
 
-#: source/ubl-strings.h:128
+#: source/ubl-strings.h:119
 msgid "expiration date:"
 msgstr "Дата устаревания:"
 
-#: source/ubl-strings.h:129
+#: source/ubl-strings.h:120
 msgid "Password change interval: minimum"
 msgstr "Интервал смены пароля: минимум"
 
-#: source/ubl-strings.h:130
+#: source/ubl-strings.h:121
 msgid "days, maximum"
 msgstr "дней, максимум"
 
-#: source/ubl-strings.h:131
+#: source/ubl-strings.h:122
 msgid "days"
 msgstr "дней"
 
-#: source/ubl-strings.h:132
+#: source/ubl-strings.h:123
 msgid "Days until warning:"
 msgstr "Дней до предупреждения:"
 
-#: source/ubl-strings.h:133
+#: source/ubl-strings.h:124
 #, fuzzy
 msgid "Days without activity:"
 msgstr "Дней без активности:"
 
-#: source/ubl-strings.h:134
+#: source/ubl-strings.h:125
 msgid "Force change at next login"
 msgstr "Принудительно сменить при следующем входе в систему"
 
-#: source/ubl-strings.h:135
+#: source/ubl-strings.h:126
 #, fuzzy
 msgid "User shell:"
 msgstr "Оболочка пользователя:"
 
-#: source/ubl-strings.h:136
+#: source/ubl-strings.h:127
 msgid "Home directory:"
 msgstr "Домашний каталог:"
 
-#: source/ubl-strings.h:137
+#: source/ubl-strings.h:128
 msgid "Don't set"
 msgstr "Не создавать"
 
-#: source/ubl-strings.h:138
+#: source/ubl-strings.h:129
 msgid "Create system user"
 msgstr "Создать системного пользователя"
 
-#: source/ubl-strings.h:139
+#: source/ubl-strings.h:130
 msgid "Create user with ununique (repeating) UID"
 msgstr "Создать пользователя с повторяющимися (не уникальными) UID"
 
-#: source/ubl-strings.h:140
+#: source/ubl-strings.h:131
 msgid "Do not check login for compliance with character rules"
 msgstr "Не проверять логин на несоответствие правилам использования символов"
 
-#: source/ubl-strings.h:141
+#: source/ubl-strings.h:132
 msgid "Temporary deactivation"
 msgstr "Временное отключение учётной записи"
 
-#: source/ubl-strings.h:142
+#: source/ubl-strings.h:133
 msgid "Save"
 msgstr "Сохранить"
 
-#: source/ubl-strings.h:143
+#: source/ubl-strings.h:134
 msgid "login_name"
 msgstr "Имя_логина"
 
-#: source/ubl-strings.h:146
+#: source/ubl-strings.h:137
 msgid "System user synchronization mode with configuration"
 msgstr "Режим синхронизации пользователя системы с конфигурацией"
 
-#: source/ubl-strings.h:147
+#: source/ubl-strings.h:138
 msgid "During system startup, load the user from the configuration"
 msgstr "При загрузке системы загрузить пользователя из конфигурации"
 
-#: source/ubl-strings.h:148
+#: source/ubl-strings.h:139
 msgid "When shutting down the system, save the user into the configuration"
 msgstr "При завершении работы системы сохранить пользователя в конфигурацию"
 
-#: source/ubl-strings.h:149
+#: source/ubl-strings.h:140
 msgid "The mode of synchronizing system user settings with the configuration"
 msgstr "Режим синхронизации параметров пользователя системы с конфигурацией"
 
-#: source/ubl-strings.h:150
+#: source/ubl-strings.h:141
 msgid ""
 "When the system boots up, load the user's settings from the configuration"
 msgstr "При загрузке системы загрузить параметры пользователя из конфигурации"
 
-#: source/ubl-strings.h:151
+#: source/ubl-strings.h:142
 msgid ""
 "When shutting down the system, save the user's settings into the "
 "configuration"
 msgstr "При завершении работы системы сохранить пользователя в конфигурацию"
 
-#: source/ubl-strings.h:154
+#: source/ubl-strings.h:145
 msgid "Repeat password:"
 msgstr "Подтверждение пароля:"
 
-#: source/ubl-strings.h:155
+#: source/ubl-strings.h:146
 msgid "Password hash:"
 msgstr "Хэш пароля:"