diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c
index 57983e3..0d0e9f1 100644
--- a/source/ubl-settings-usergroups.c
+++ b/source/ubl-settings-usergroups.c
@@ -1382,7 +1382,12 @@ void on_user_login_update(GtkWidget *self, ubl_settings_usergroups_user_window *
 		gtk_entry_set_text(GTK_ENTRY(window->userGroupsEntry),gtk_entry_get_text(GTK_ENTRY(window->userLoginEntry)));
 	} else {
 		gtk_entry_set_text(GTK_ENTRY(window->userGroupsEntry),"");
-		}
+	}
+	if (gtk_combo_box_get_active(GTK_COMBO_BOX(window->userHomeCombo))==0){
+		char *homepath = yon_char_append("/home/",(char*)gtk_entry_get_text(GTK_ENTRY(window->userLoginEntry)));
+		gtk_entry_set_text(GTK_ENTRY(window->userHomeEntry),homepath);
+		free(homepath);
+	}
 }
 
 void on_user_save(GtkWidget *self, dictionary *dict){
@@ -1522,6 +1527,10 @@ void on_user_save(GtkWidget *self, dictionary *dict){
 	int user_home_active = gtk_combo_box_get_active(GTK_COMBO_BOX(window->userHomeCombo));
 	if (user_home_active==2){
 		user_home=yon_char_unite(" --home-dir ",(char*)gtk_entry_get_text(GTK_ENTRY(window->userHomeEntry)),NULL);
+	} else if (user_home_active==0){
+		user_home=yon_char_unite(" --home-dir /home/",login,NULL);
+	} else if (user_home_active==1){
+		user_home="--no-create-home";
 	} else user_home = "";
 
 	int system_user_active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->userCreateSystemCheck));