Index: user-edit.php
===================================================================
--- user-edit.php	(revision 11315)
+++ user-edit.php	(working copy)
@@ -295,9 +295,14 @@
 			$public_display = array();
 			$public_display['display_nickname']  = $profileuser->nickname;
 			$public_display['display_username']  = $profileuser->user_login;
-			$public_display['display_firstname'] = $profileuser->first_name;
-			$public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
-			$public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
+			if ( !$profileuser->first_name == '')
+				$public_display['display_firstname'] = $profileuser->first_name;
+			if ( !$profileuser->last_name == '')
+				$public_display['display_lastname'] = $profileuser->last_name;
+			if ( !$profileuser->first_name == '' && !$profileuser->last_name == '') {
+				$public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
+				$public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
+			}
 			if ( !in_array( $profileuser->display_name, $public_display ) )// Only add this if it isn't duplicated elsewhere
 				$public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;
 			$public_display = array_map( 'trim', $public_display );