diff --git a/core/um-actions-register.php b/core/um-actions-register.php
index 46bb9118..c49d734c 100644
--- a/core/um-actions-register.php
+++ b/core/um-actions-register.php
@@ -80,7 +80,7 @@
 
 		$unique_userID = $ultimatemember->query->count_users() + 1;
 
-		if ( ! isset( $user_login ) ||  strlen( $user_login ) > 30 ) {
+		if ( ! isset( $user_login ) ||  strlen( $user_login ) > 30 && ! is_email( $user_login ) ) {
 			$user_login = 'user' . $unique_userID;
 		}