Index: wp-includes/ms-functions.php
===================================================================
--- wp-includes/ms-functions.php	(revision 16825)
+++ wp-includes/ms-functions.php	(working copy)
@@ -1387,7 +1387,7 @@
 	if ( $meta[ 'add_to_blog' ] ) {
 		$blog_id = $meta[ 'add_to_blog' ];
 		$role = $meta[ 'new_role' ];
-		remove_user_from_blog($user_id, $current_site->blogid); // remove user from main blog.
+		remove_user_from_blog($user_id, $current_site->blog_id); // remove user from main blog.
 		add_user_to_blog( $blog_id, $user_id, $role );
 		update_user_meta( $user_id, 'primary_blog', $blog_id );
 	}
Index: wp-admin/user-new.php
===================================================================
--- wp-admin/user-new.php	(revision 16825)
+++ wp-admin/user-new.php	(working copy)
@@ -108,7 +108,7 @@
 				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[ 'adduser' ] ) && isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
+			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' );