diff --git a/includes/core/um-actions-account.php b/includes/core/um-actions-account.php
index 885c4811..6fac08c1 100644
--- a/includes/core/um-actions-account.php
+++ b/includes/core/um-actions-account.php
@@ -9,6 +9,8 @@
  * @param array $args
  */
 function um_submit_account_errors_hook( $args ) {
+	global $current_user;
+
 	if ( ! isset( $args['_um_account'] ) && ! isset( $args['_um_account_tab'] ) ) {
 		return;
 	}
@@ -19,8 +21,6 @@ function um_submit_account_errors_hook( $args ) {
 		UM()->form()->add_error( 'um_account_security', __( 'Are you hacking? Please try again!', 'ultimate-member' ) );
 	}
 
-	$user = get_user_by( 'login', um_user( 'user_login' ) );
-
 	switch ( $tab ) {
 		case 'delete': {
 			// delete account
@@ -28,7 +28,7 @@ function um_submit_account_errors_hook( $args ) {
 				if ( strlen( trim( sanitize_text_field( $args['single_user_password'] ) ) ) === 0 ) {
 					UM()->form()->add_error( 'single_user_password', __( 'You must enter your password', 'ultimate-member' ) );
 				} else {
-					if ( ! wp_check_password( sanitize_text_field( $args['single_user_password'] ), $user->data->user_pass, $user->data->ID ) ) {
+					if ( ! wp_check_password( sanitize_text_field( $args['single_user_password'] ), $current_user->data->user_pass, $current_user->data->ID ) ) {
 						UM()->form()->add_error( 'single_user_password', __( 'This is not your password', 'ultimate-member' ) );
 					}
 				}
@@ -69,7 +69,7 @@ function um_submit_account_errors_hook( $args ) {
 						UM()->form()->add_error( 'current_user_password', __( 'This is not your password', 'ultimate-member' ) );
 						return;
 					} else {
-						if ( ! wp_check_password( $args['current_user_password'], $user->data->user_pass, $user->data->ID ) ) {
+						if ( ! wp_check_password( $args['current_user_password'], $current_user->data->user_pass, $current_user->data->ID ) ) {
 							UM()->form()->add_error( 'current_user_password', __( 'This is not your password', 'ultimate-member' ) );
 							return;
 						}
@@ -105,7 +105,7 @@ function um_submit_account_errors_hook( $args ) {
 			$account_name_require = UM()->options()->get( 'account_name_require' );
 
 			if ( isset( $args['user_login'] ) ) {
-				$args['user_login'] = sanitize_text_field( $args['user_login'] );
+				$args['user_login'] = sanitize_user( $args['user_login'] );
 			}
 			if ( isset( $args['first_name'] ) ) {
 				$args['first_name'] = sanitize_text_field( $args['first_name'] );
@@ -120,11 +120,6 @@ function um_submit_account_errors_hook( $args ) {
 				$args['single_user_password'] = sanitize_text_field( $args['single_user_password'] );
 			}
 
-			if ( ! empty( $args['user_login'] ) && ! validate_username( $args['user_login'] ) ) {
-				UM()->form()->add_error( 'user_login', __( 'Your username is invalid', 'ultimate-member' ) );
-				return;
-			}
-
 			if ( isset( $args['first_name'] ) && ( strlen( trim( $args['first_name'] ) ) === 0 && $account_name_require ) ) {
 				UM()->form()->add_error( 'first_name', __( 'You must provide your first name', 'ultimate-member' ) );
 			}
@@ -153,7 +148,7 @@ function um_submit_account_errors_hook( $args ) {
 				if ( strlen( trim( $args['single_user_password'] ) ) === 0 ) {
 					UM()->form()->add_error( 'single_user_password', __( 'You must enter your password', 'ultimate-member' ) );
 				} else {
-					if ( ! wp_check_password( $args['single_user_password'], $user->data->user_pass, $user->data->ID ) ) {
+					if ( ! wp_check_password( $args['single_user_password'], $current_user->data->user_pass, $current_user->data->ID ) ) {
 						UM()->form()->add_error( 'single_user_password', __( 'This is not your password', 'ultimate-member' ) );
 					}
 				}
@@ -305,10 +300,8 @@ function um_submit_account_details( $args ) {
 
 		if ( 'single_user_password' === $k ) {
 			continue;
-		}
-
-		if ( 'user_login' === $k ) {
-			$v = sanitize_user( $v );
+		} elseif ( 'user_login' === $k ) {
+			continue;
 		} elseif ( 'first_name' === $k ) {
 			$v = sanitize_text_field( $v );
 		} elseif ( 'last_name' === $k ) {