diff --git a/source/ubl-settings-usergroups-user.c b/source/ubl-settings-usergroups-user.c
index 21e773c..4364475 100644
--- a/source/ubl-settings-usergroups-user.c
+++ b/source/ubl-settings-usergroups-user.c
@@ -527,12 +527,7 @@ void on_user_save(GtkWidget *self, dictionary *dict){
 			return;
 
 	}
-	if (login[0]>'0'&&login[0]<'9'&&!do_not_check_actve){
-			yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),USER_BEGINS_WITH_DIGIT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
-			yon_ubl_status_highlight_incorrect(window->userLoginEntry);
-			return;
-	}
-	if ((strstr(login," ")||strstr(login,"\'")||strstr(login,"\"")||strstr(login,"\n")||strstr(login,"`"))&&!do_not_check_actve){
+	if (!g_regex_match_simple("[a-zA-Z_][a-zA-Z0-9_-]*",login,0,0)&&!do_not_check_actve){
 		yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),INVALID_LOGIN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
 		yon_ubl_status_highlight_incorrect(window->userLoginEntry);
 		return;