diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c
index 323e502..eca8d33 100644
--- a/source/ubl-settings-usergroups.c
+++ b/source/ubl-settings-usergroups.c
@@ -1615,7 +1615,7 @@ void on_main_edit(GtkWidget *self, main_window *widgets){
 				if(parsed_size>5){
 					if (strcmp(parameters[5],"x")){
 						gtk_entry_set_text(GTK_ENTRY(window->userPasswordEntry), parsed_size>5?parameters[5]:"");
-						gtk_combo_box_set_active(GTK_COMBO_BOX(window->userPasswordCombo),3);
+						gtk_combo_box_set_active(GTK_COMBO_BOX(window->userPasswordCombo),2);
 					}
 				
 				}
@@ -1711,7 +1711,7 @@ void on_main_edit(GtkWidget *self, main_window *widgets){
 				if (size>4){
 					if (strcmp(parsed[4],"")&&strcmp(parsed[4],"x")){
 						gtk_entry_set_text(GTK_ENTRY(window->PasswordEntry),parsed[4]);
-						gtk_combo_box_set_active(GTK_COMBO_BOX(window->PasswordCombo),4);
+						gtk_combo_box_set_active(GTK_COMBO_BOX(window->PasswordCombo),2);
 					} else {
 						gtk_combo_box_set_active(GTK_COMBO_BOX(window->PasswordCombo),1);
 					}
diff --git a/ubl-settings-usergroups-user.glade b/ubl-settings-usergroups-user.glade
index e6b56f8..8a6640a 100644
--- a/ubl-settings-usergroups-user.glade
+++ b/ubl-settings-usergroups-user.glade
@@ -237,7 +237,6 @@
                                       <item translatable="yes">Default</item>
                                       <item translatable="yes">No password required</item>
                                       <item translatable="yes">Set a password</item>
-                                      <item translatable="yes">Encrypted password</item>
                                     </items>
                                   </object>
                                   <packing>