diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 4cfad313c2..29c0857b96 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -186,13 +186,13 @@ else
 if ( current_user_can('list_users') ) {
 	$_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
 	$submenu['users.php'][5] = array(__('Users'), 'list_users', 'users.php');
-	$submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');
+	$submenu['users.php'][10] = array(_x('Add New', 'user'), 'promote_users', 'user-new.php');
 
 	$submenu['users.php'][15] = array(__('Your Profile'), 'read', 'profile.php');
 } else {
 	$_wp_real_parent_file['users.php'] = 'profile.php';
 	$submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
-	$submenu['profile.php'][10] = array(__('Add New User'), 'create_users', 'user-new.php');
+	$submenu['profile.php'][10] = array(__('Add New User'), 'promote_users', 'user-new.php');
 }
 
 $menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'div' );
diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php
index 3bf64208cc..da902d7ee6 100644
--- a/wp-admin/user-new.php
+++ b/wp-admin/user-new.php
@@ -9,12 +9,9 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
-if ( !current_user_can('create_users') )
+if ( ! current_user_can('create_users') || ! current_user_can('promote_users') )
 	wp_die(__('Cheatin’ uh?'));
 
-if ( is_multisite() && !get_site_option( 'add_new_users' ) )
-	wp_die( __('Page disabled by the administrator') );
-
 if ( is_multisite() ) {
 	function admin_created_user_email( $text ) {
 		/* translators: 1: Site name, 2: site URL, 3: role */
@@ -37,6 +34,53 @@ Please click the following link to activate your user account:
 if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
 	check_admin_referer('add-user');
 
+	$user_details = null;
+	if ( false !== strpos($_REQUEST[ 'email' ], '@') ) {
+		$user_details = get_user_by('email', $_REQUEST[ 'email' ]);
+	} else {
+		if ( is_super_admin() ) {
+			$user_details = get_user_by('login', $_REQUEST[ 'email' ]);
+		} else {
+			wp_redirect( add_query_arg( array('update' => 'enter_email'), 'user-new.php' ) );
+			die();
+		}
+	}
+
+	if ( !$user_details ) {
+		wp_redirect( add_query_arg( array('update' => 'does_not_exist'), 'user-new.php' ) );
+		die();
+	}
+
+	if ( ! current_user_can('promote_user', $user_details->ID) )
+		wp_die(__('Cheatin’ uh?'));
+
+	// Adding an existing user to this blog
+	$new_user_email = esc_html(trim($_REQUEST['email']));
+	$redirect = 'user-new.php';
+	$username = $user_details->user_login;
+	$user_id = $user_details->ID;
+	if ( ( $username != null && !is_super_admin( $user_id ) ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) {
+		$redirect = add_query_arg( array('update' => 'addexisting'), 'user-new.php' );
+	} else {
+		if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
+			add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) );
+			$redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );
+		} else {
+			$newuser_key = substr( md5( $user_id ), 0, 5 );
+			add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) );
+			$message = __("Hi,\n\nYou have been invited to join '%s' at\n%s as a %s.\nPlease click the following link to confirm the invite:\n%s\n");
+			wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ),  sprintf($message, get_option('blogname'), site_url(), $_REQUEST[ 'role' ], site_url("/newbloguser/$newuser_key/")));
+			$redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
+		}
+	}
+	wp_redirect( $redirect );
+	die();
+} elseif ( isset($_REQUEST['action']) && 'createuser' == $_REQUEST['action'] ) {
+	check_admin_referer('create-user');
+
+	if ( ! current_user_can('create_users') )
+		wp_die(__('Cheatin’ uh?'));
+
 	if ( !is_multisite() ) {
 		$user_id = add_user();
 
@@ -53,59 +97,38 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
 			die();
 		}
 	} else {
-		$user_login = preg_replace( "/\s+/", '', sanitize_user( $_REQUEST[ 'user_login' ], true ) );
-		$user_details = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->users} WHERE user_login = %s AND user_email = %s", $user_login, $_REQUEST[ 'email' ] ) );
-		if ( $user_details ) {
-			// Adding an existing user to this blog
-			$new_user_email = esc_html(trim($_REQUEST['email']));
-			$redirect = 'user-new.php';
-			$username = $user_details->user_login;
-			$user_id = $user_details->ID;
-			if ( ( $username != null && !is_super_admin( $user_id ) ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) {
-				$redirect = add_query_arg( array('update' => 'addexisting'), 'user-new.php' );
+		// Adding a new user to this blog
+		$user_details = wpmu_validate_user_signup( $_REQUEST[ 'user_login' ], $_REQUEST[ 'email' ] );
+		unset( $user_details[ 'errors' ]->errors[ 'user_email_used' ] );
+		if ( is_wp_error( $user_details[ 'errors' ] ) && !empty( $user_details[ 'errors' ]->errors ) ) {
+			$add_user_errors = $user_details[ 'errors' ];
+		} else {
+			$new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true));
+			if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
+				add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email
+			}
+			wpmu_signup_user( $new_user_login, $_REQUEST[ 'email' ], array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) );
+			if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
+				$key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $_REQUEST[ 'email' ] ) );
+				wpmu_activate_signup( $key );
+				$redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );
 			} else {
-				if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
-					add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) );
-					$redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );
-				} else {
-					$newuser_key = substr( md5( $user_id ), 0, 5 );
-					add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) );
-					$message = __("Hi,\n\nYou have been invited to join '%s' at\n%s as a %s.\nPlease click the following link to confirm the invite:\n%s\n");
-					wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ),  sprintf($message, get_option('blogname'), site_url(), $_REQUEST[ 'role' ], site_url("/newbloguser/$newuser_key/")));
-					$redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
-				}
+				$redirect = add_query_arg( array('update' => 'newuserconfimation'), 'user-new.php' );
 			}
 			wp_redirect( $redirect );
 			die();
-		} else {
-			// Adding a new user to this blog
-			$user_details = wpmu_validate_user_signup( $_REQUEST[ 'user_login' ], $_REQUEST[ 'email' ] );
-			unset( $user_details[ 'errors' ]->errors[ 'user_email_used' ] );
-			if ( is_wp_error( $user_details[ 'errors' ] ) && !empty( $user_details[ 'errors' ]->errors ) ) {
-				$add_user_errors = $user_details[ 'errors' ];
-			} else {
-				$new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true));
-				if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
-					add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email
-				}
-				wpmu_signup_user( $new_user_login, $_REQUEST[ 'email' ], array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) );
-				if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
-					$key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $_REQUEST[ 'email' ] ) );
-					wpmu_activate_signup( $key );
-					$redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );
-				} else {
-					$redirect = add_query_arg( array('update' => 'newuserconfimation'), 'user-new.php' );
-				}
-				wp_redirect( $redirect );
-				die();
-			}
 		}
 	}
 }
 
+
 $title = __('Add New User');
 $parent_file = 'users.php';
 
+$do_both = false;
+if ( is_multisite() && current_user_can('promote_users') && current_user_can('create_users') )
+	$do_both = true;
+
 add_contextual_help($current_screen,
     '<p>' . __('To add a new user to your site, fill in the form on this screen. If you&#8217;re not sure which role to assign, you can use the link below to review the different roles and their capabilities. Here is a basic overview of roles:') . '</p>' .
     '<ul>' .
@@ -144,6 +167,12 @@ if ( isset($_GET['update']) ) {
 			case "addexisting":
 				$messages[] = __('That user is already a member of this site.');
 				break;
+			case "does_not_exist":
+				$messages[] = __('The requested user does not exist.');
+				break;
+			case "does_not_exist":
+				$messages[] = __('Please enter a valid email address.');
+				break;
 		}
 	} else {
 		if ( 'add' == $_GET['update'] )
@@ -182,20 +211,58 @@ if ( ! empty( $messages ) ) {
 <div id="ajax-response"></div>
 
 <?php
-if ( !is_multisite() ) {
-	if ( get_option('users_can_register') )
-		echo '<p>' . sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), site_url('wp-register.php')) . '</p>';
-	else
-		echo '<p>' . sprintf(__('Users cannot currently <a href="%1$s">register themselves</a>, but you can manually create users here.'), admin_url('options-general.php#users_can_register')) . '</p>';
-} else {
-	echo '<p>' . __( 'You can add new users to your site in two ways:' ) . '<ol><li> ' . __( 'Enter the username and email address of an existing user on this network.' ) . '</li><li> ' . __( 'Enter the username and the email address of a person who is not already a member of this network. Choose the username carefully, it cannot be changed.' ) . '</li></ol></p>';
-	echo '<p>' . __( 'That person will be sent an email asking them to click a link confirming the invite. New users will then be sent an email with a randomly generated password and a login link.' ) . '</p>';
-}
+if ( is_multisite() ) {
+	if ( $do_both )
+		echo '<h3 id="add-existing-user">' . __('Add Existing User') . '</h3>';
+	if ( !is_super_admin() ) {
+		_e( 'Enter the email address of an existing user on this network to invite them to this site.  That person will be sent an email asking them to confirm the invite.' );
+		$label = __('E-mail');
+	} else {
+		_e( 'Enter the email address or username of an existing user on this network to invite them to this site.  That person will be sent an email asking them to confirm the invite.' );
+		$label = __('E-mail or Username');
+	}
 ?>
-<form action="#add-new-user" method="post" name="adduser" id="adduser" class="add:users: validate"<?php do_action('user_new_form_tag');?>>
+<form action="#add-existing-user" method="post" name="adduser" id="adduser" class="add:users: validate"<?php do_action('user_new_form_tag');?>>
+<input name="action" type="hidden" id="action" value="adduser" />
 <?php wp_nonce_field('add-user') ?>
+<table class="form-table">
+	<tr class="form-field form-required">
+		<th scope="row"><label for="email"><?php echo $label; ?></label></th>
+		<td><input name="email" type="text" id="email" value="<?php echo esc_attr($new_user_email); ?>" /></td>
+	</tr>
+	<tr class="form-field">
+		<th scope="row"><label for="role"><?php _e('Role'); ?></label></th>
+		<td><select name="role" id="role">
+			<?php
+			if ( !$new_user_role )
+				$new_user_role = !empty($current_role) ? $current_role : get_option('default_role');
+			wp_dropdown_roles($new_user_role);
+			?>
+			</select>
+		</td>
+	</tr>
+<?php if ( is_super_admin() ) { ?>
+	<tr>
+		<th scope="row"><label for="noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
+		<td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" /> <?php _e( 'Add the user without sending them a confirmation email.' ); ?></label></td>
+	</tr>
+<?php } ?>
+</table>
+<?php submit_button( __( 'Add User '), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>
+</form>
 <?php
-//Load up the passed data, else set to a default.
+} // is_multisite()
+
+if ( current_user_can( 'create_users') ) {
+	if ( $do_both )
+		echo '<h3 id="create-new-user">' . __('Create New User') . '</h3>';
+?>
+<p><?php _e('Create a brand new user and add it to this site.'); ?></p>
+<form action="#create-new-user" method="post" name="createuser" id="adduser" class="add:users: validate"<?php do_action('user_new_form_tag');?>>
+<input name="action" type="hidden" id="action" value="createuser" />
+<?php wp_nonce_field('create-user') ?>
+<?php
+// Load up the passed data, else set to a default.
 foreach ( array('user_login' => 'login', 'first_name' => 'firstname', 'last_name' => 'lastname',
 				'email' => 'email', 'url' => 'uri', 'role' => 'role') as $post_field => $var ) {
 	$var = "new_user_$var";
@@ -206,8 +273,7 @@ $new_user_send_password = !$_POST || isset($_POST['send_password']);
 ?>
 <table class="form-table">
 	<tr class="form-field form-required">
-		<th scope="row"><label for="user_login"><?php _e('Username'); ?> <span class="description"><?php _e('(required)'); ?></span></label>
-		<input name="action" type="hidden" id="action" value="adduser" /></th>
+		<th scope="row"><label for="user_login"><?php _e('Username'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
 		<td><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr($new_user_login); ?>" aria-required="true" /></td>
 	</tr>
 	<tr class="form-field form-required">
@@ -263,10 +329,10 @@ $new_user_send_password = !$_POST || isset($_POST['send_password']);
 	<?php } ?>
 </table>
 
-<?php submit_button( __( 'Add User '), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>
+<?php submit_button( __( 'Add User '), 'primary', 'createuser', true, array( 'id' => 'createusersub' ) ); ?>
 
 </form>
-
+<?php } // current_user_can('create_users') ?>
 </div>
 <?php
 include('./admin-footer.php');