diff --git a/includes/core/um-actions-register.php b/includes/core/um-actions-register.php
index eba640c7..afd946bd 100644
--- a/includes/core/um-actions-register.php
+++ b/includes/core/um-actions-register.php
@@ -309,10 +309,14 @@ function um_submit_form_register( $args ) {
 
 		// if full name exists
 		$count = 1;
-		while ( username_exists( $user_login ) ) {
-			$user_login .= $count;
+		$temp_user_login = $user_login;
+		while ( username_exists( $temp_user_login ) ) {
+			$temp_user_login = $user_login . $count;
 			$count++;
 		}
+		if ( $temp_user_login !== $user_login ) {
+			$user_login = $temp_user_login;
+		}
 	}
 
 	if ( ! isset( $user_login ) && isset( $user_email ) && $user_email ) {
diff --git a/readme.txt b/readme.txt
index d9c78d71..fc3c52b7 100644
--- a/readme.txt
+++ b/readme.txt
@@ -144,6 +144,9 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
   - Fixed fields labels on member directory
   - Fixed profile form cover photo ratio value
   - Fixed profile and registration form default field's values
+  - Fixed member directory notices with disabled metadata
+  - Fixed textarea profile field formatting
+  - Fixed registration without username field
 
 = 2.0.38: January 10, 2019 =