Index: wp-includes/admin-bar.php
===================================================================
--- wp-includes/admin-bar.php	(revision 19700)
+++ wp-includes/admin-bar.php	(working copy)
@@ -706,16 +706,16 @@
 	if ( defined('XMLRPC_REQUEST') || defined('APP_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
 		return false;
 
-	// Integrated into the admin.
-	if ( is_admin() )
-		return true;
-
 	if ( ! isset( $show_admin_bar ) ) {
 		if ( ! is_user_logged_in() || 'wp-login.php' == $pagenow ) {
 			$show_admin_bar = false;
 		} else {
 			$show_admin_bar = _get_admin_bar_pref();
 		}
+	} else {
+		// Integrated into the admin.
+		if ( is_admin() && $show_admin_bar )
+			return true;
 	}
 
 	$show_admin_bar = apply_filters( 'show_admin_bar', $show_admin_bar );