diff --git a/wp-admin/includes/class-wp-ms-users-list-table.php b/wp-admin/includes/class-wp-ms-users-list-table.php
index 0a3adaaad1..42cea7eb6f 100644
--- a/wp-admin/includes/class-wp-ms-users-list-table.php
+++ b/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -266,10 +266,10 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 	public function column_name( $user ) {
 		if ( $user->first_name && $user->last_name ) {
 			echo "$user->first_name $user->last_name";
-		} else if ( ! empty( $user->first_name ) ) {
-			echo "$user->first_name";
-		} else if ( ! empty( $user->last_name ) ) {
-			echo "$user->last_name";
+		} elseif ( $user->first_name ) {
+			echo $user->first_name;
+		} elseif ( $user->last_name ) {
+			echo $user->last_name;
 		} else {
 			echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . _x( 'Unknown', 'name' ) . '</span>';
 		}
diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php
index 7a1359c592..8dd579383b 100644
--- a/wp-admin/includes/class-wp-users-list-table.php
+++ b/wp-admin/includes/class-wp-users-list-table.php
@@ -488,10 +488,10 @@ class WP_Users_List_Table extends WP_List_Table {
 					case 'name':
 						if ( $user_object->first_name && $user_object->last_name ) {
 							$r .= "$user_object->first_name $user_object->last_name";
-						} else if ( ! empty( $user_object->first_name ) ) {
-							$r .= "$user_object->first_name";
-						} else if ( ! empty( $user_object->last_name) ) {
-							$r .= "$user_object->last_name";
+						} elseif ( $user_object->first_name ) {
+							$r .= $user_object->first_name;
+						} elseif ( $user_object->last_name ) {
+							$r .= $user_object->last_name;
 						} else {
 							$r .= '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . _x( 'Unknown', 'name' ) . '</span>';
 						}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 70aed6d6b4..05180f59f4 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42256';
+$wp_version = '5.0-alpha-42257';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.