diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c
index 07bfc5c..1532298 100644
--- a/source/ubl-settings-usergroups.c
+++ b/source/ubl-settings-usergroups.c
@@ -1514,9 +1514,7 @@ void on_user_save(GtkWidget *self, dictionary *dict){
 
 	username = (char*)gtk_entry_get_text(GTK_ENTRY(window->userUserNameEntry));
 	if (yon_char_is_empty(username)){
-			yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
-			yon_ubl_status_highlight_incorrect(window->userUserNameEntry);
-			return;
+		username="";
 	}
 
 	int main_group_active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->userGroupsCheck));
@@ -1608,7 +1606,7 @@ void on_user_save(GtkWidget *self, dictionary *dict){
 
 	extra_options=(char*)gtk_entry_get_text(GTK_ENTRY(window->userExtraOptionsEntry));
 
-	if (window->old_password&&strcmp(window->old_password,password)){
+	if (!window->old_password||window->old_password&&strcmp(window->old_password,password)){
 		time_t t = time(NULL);
 		struct tm tm = *localtime(&t);
 		password_changed_date = yon_char_unite(yon_char_from_int(1900+tm.tm_year),"-",yon_char_from_int(tm.tm_mon+1),"-",yon_char_from_int(tm.tm_mday),NULL);