diff --git a/core/um-filters-user.php b/core/um-filters-user.php
index 37223a1b..6936cee7 100644
--- a/core/um-filters-user.php
+++ b/core/um-filters-user.php
@@ -80,15 +80,8 @@
 	function um_clean_user_basename_filter( $value, $raw ){
 		
 		// Checks if last name has dash
-		if( ! empty( um_user('last_name') ) && strrpos( um_user('last_name') ,"-") ){
-			$current_user_last_name = strtolower( um_user('last_name') );
-			
-			if( strrpos($raw, $current_user_last_name) > -1 ){
-				$a = strrpos($current_user_last_name, $raw); 
-				$swap_lastname = substr($current_user_last_name, $a);
-				$swap_lastname = str_replace('-',' ', $swap_lastname);
-				$value = str_replace( $swap_lastname, $current_user_last_name, $value);
-			}
+		if( ! empty( $value ) && strrpos( $value ,"_") > -1 ){
+			$value = str_replace( '_', '-', $value );
 		}
 
 		return $value;
diff --git a/core/um-permalinks.php b/core/um-permalinks.php
index d7e14de5..2529c16f 100644
--- a/core/um-permalinks.php
+++ b/core/um-permalinks.php
@@ -211,8 +211,6 @@ class UM_Permalinks {
 		        global $sitepress;
 		        $profile_url = $sitepress->language_url( $language );
 		    }
-
-
 		}
 
 		if ( um_get_option('permalink_base') == 'user_login' ) {
@@ -240,10 +238,12 @@ class UM_Permalinks {
 		if( in_array( um_get_option( 'permalink_base'),  $full_name_permalinks ) )
 		{
 			$full_name = um_user( 'full_name' );
-			$count     = intval( $wpdb->get_var( $wpdb->prepare(
-				"SELECT COUNT(*) as count FROM {$wpdb->usermeta} WHERE meta_key = 'full_name' AND meta_value = '%s'",
-				$full_name
-			) ) );
+			$last_name = um_user( 'last_name' );
+			$count     = intval( um_is_meta_value_exists( 'full_name', $full_name ) );
+
+			if( strpos( $last_name, '-') > -1 && strpos( $full_name, '-' ) > -1 ){
+				$full_name  = str_replace('-', '_', $full_name  );
+			}
 
 			if( $count > 1 )
 			{