diff --git a/core/um-actions-save-profile.php b/core/um-actions-save-profile.php
index 3de8f286..6a167d95 100644
--- a/core/um-actions-save-profile.php
+++ b/core/um-actions-save-profile.php
@@ -47,5 +47,37 @@
 			
 			
 		}
+		
+		// Sync display name changes
+		$option = um_get_option('display_name');
+		$user_id = $ultimatemember->user->id;
+		switch ( $option ) {
+			default:
+				break;
+			case 'full_name':
+				$update_name = get_user_meta( $user_id, 'first_name', true ) . ' ' . get_user_meta( $user_id, 'last_name', true );
+				break;
+			case 'sur_name':
+				$fname = get_user_meta( $user_id, 'first_name', true );
+				$lname = get_user_meta( $user_id, 'last_name', true );
+				$update_name = $lname . ' ' . $fname;
+				break;
+			case 'initial_name':
+				$fname = get_user_meta( $user_id, 'first_name', true );
+				$lname = get_user_meta( $user_id, 'last_name', true );
+				$update_name = $fname . ' ' . $lname[0];
+				break;
+			case 'initial_name_f':
+				$fname = get_user_meta( $user_id, 'first_name', true );
+				$lname = get_user_meta( $user_id, 'last_name', true );
+				$update_name = $fname[0] . ' ' . $lname;
+				break;
+			case 'nickname':
+				$update_name = get_user_meta( $user_id, 'nickname', true );
+				break;
+		}
 
+		if ( isset( $update_name ) ) {
+			wp_update_user( array( 'ID' => $user_id, 'display_name' => $update_name ) );
+		}
 	}
\ No newline at end of file
diff --git a/core/um-builtin.php b/core/um-builtin.php
index 087fdc19..750ee98c 100644
--- a/core/um-builtin.php
+++ b/core/um-builtin.php
@@ -603,17 +603,7 @@ class UM_Builtin {
 				'public' => 1,
 				'editable' => 1,
 			),
-			
-			'display_name' => array(
-				'title' => __('Display Name','ultimatemember'),
-				'metakey' => 'display_name',
-				'type' => 'text',
-				'label' => __('Display Name','ultimatemember'),
-				'required' => 0,
-				'public' => 1,
-				'editable' => 1,
-			),
-			
+
 			'user_registered' => array(
 				'title' => __('Registration Date','ultimatemember'),
 				'metakey' => 'user_registered',
diff --git a/core/um-short-functions.php b/core/um-short-functions.php
index 585738cb..6d94373c 100644
--- a/core/um-short-functions.php
+++ b/core/um-short-functions.php
@@ -1187,7 +1187,7 @@ function um_user( $data, $attrs = null ) {
 				
 			if ( $op == 'sur_name' ) {
 				if ( um_user('first_name') && um_user('last_name') ) {
-					$name = um_user('last_name') . ', ' . um_user('first_name');
+					$name = um_user('last_name') . ' ' . um_user('first_name');
 				} else {
 					$name = um_profile( $data );
 				}
diff --git a/um-config.php b/um-config.php
index b7e3179d..5caba687 100644
--- a/um-config.php
+++ b/um-config.php
@@ -122,7 +122,7 @@ $this->sections[] = array(
 				'select2'		=> array( 'allowClear' => 0, 'minimumResultsForSearch' => -1 ),
                 'title'    		=> __( 'User Display Name','ultimatemember' ),
                 'desc' 	   		=> __( 'This is the name that will be displayed for users on the front end of your site. Default setting uses first/last name as display name if it exists','ultimatemember' ),
-                'default'  		=> 'default',
+                'default'  		=> 'full_name',
 				'options' 		=> array(
 									'default'			=> __('Default WP Display Name','ultimatemember'),
 									'nickname'			=> __('Nickname','ultimatemember'),