diff --git a/includes/core/class-permalinks.php b/includes/core/class-permalinks.php
index 4b400b65..f10c9e7d 100644
--- a/includes/core/class-permalinks.php
+++ b/includes/core/class-permalinks.php
@@ -307,7 +307,7 @@ if ( ! class_exists( 'Permalinks' ) ) {
 		        $separate = $separated[$permalink_base];
 		        $first_name       = um_user( 'first_name' );
 		        $last_name        = um_user( 'last_name' );
-		        $full_name  = sprintf('%s %s',$first_name,$last_name);
+		        $full_name  = trim(sprintf('%s %s',$first_name,$last_name));
 		        $full_name        = preg_replace( '/\s+/', ' ', $full_name ); // Remove double spaces
 		        $profile_slug = UM()->permalinks()->profile_slug( $full_name, $first_name, $last_name );
 
@@ -325,9 +325,14 @@ if ( ! class_exists( 'Permalinks' ) ) {
 				        $append ++;
 
 			        }
-		        }
 
 		        $user_in_url = $this->profile_slug( $username, $first_name, $last_name );
+			        if(empty($user_in_url)){
+				        $user_in_url = um_user('user_login');
+			        }
+			        $user_in_url = trim($user_in_url,$separate);
+		        }
+
 	        }
 
             update_user_meta( um_user('ID'), "um_user_profile_url_slug_{$permalink_base}", $user_in_url  );
@@ -339,7 +344,7 @@ if ( ! class_exists( 'Permalinks' ) ) {
 
 	    function exist_url_slug_permalink_base( $permalink_base, $slug ) {
 		    global $wpdb;
-
+		    
 		    if ( $user_id = $wpdb->get_var( "SELECT `user_id`  FROM `{$wpdb->usermeta}` WHERE `meta_key` = 'um_user_profile_url_slug_{$permalink_base}' AND `meta_value` = '{$slug}'" ) ) {
 			    return $user_id;
 		    }
@@ -490,7 +495,6 @@ if ( ! class_exists( 'Permalinks' ) ) {
 
                     break;
             }
-
             return $user_in_url ;
 
         }
diff --git a/includes/core/class-user.php b/includes/core/class-user.php
index 7c4ba64d..9f3999ba 100644
--- a/includes/core/class-user.php
+++ b/includes/core/class-user.php
@@ -233,7 +233,7 @@ if ( ! class_exists( 'User' ) ) {
 				$separate = $separated[ $permalink_base ];
 				$first_name = $userdata->first_name;
 				$last_name  = $userdata->last_name;
-				$full_name  = sprintf( '%s %s', $first_name, $last_name );
+				$full_name  = trim(sprintf( '%s %s', $first_name, $last_name ));
 
 				$full_name = preg_replace( '/\s+/', ' ', $full_name ); // Remove double spaces
 
@@ -256,7 +256,12 @@ if ( ! class_exists( 'User' ) ) {
 						$append++;
 					}
 				}
+
 				$user_in_url = UM()->permalinks()->profile_slug( $username, $first_name, $last_name );
+				if(empty($user_in_url)){
+					$user_in_url = $userdata->user_login;
+                }
+				$user_in_url = trim($user_in_url,$separate);
 			}
 
 			update_user_meta( $user_id, "um_user_profile_url_slug_{$permalink_base}", $user_in_url );