diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 1373b65847..5dc4d3efbe 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -440,7 +440,7 @@ function upgrade_all() {
 	if ( $wp_current_db_version < 11958 )
 		upgrade_290();
 
-	if ( $wp_current_db_version < 14217 )
+	if ( $wp_current_db_version < 14595 )
 		upgrade_300();
 
 	maybe_disable_automattic_widgets();
@@ -1136,8 +1136,10 @@ function upgrade_300() {
 		$wpdb->update( $wpdb->postmeta, array( 'meta_value' => '' ), array( 'meta_key' => '_menu_item_target', 'meta_value' => '_self' ) );
 
 	// 3.0-beta metabox changes. can be removed before release. // r13551
-	if ( ( !is_multisite() || is_main_site() ) && $wp_current_db_version >= 13309 && $wp_current_db_version < 14217 )
-		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key LIKE '{$wpdb->base_prefix}%meta-box-hidden%' OR meta_key LIKE '{$wpdb->base_prefix}%closedpostboxes%'" );
+	if ( ( !is_multisite() || is_main_site() ) && $wp_current_db_version >= 13309 && $wp_current_db_version < 14595 ) {
+		$prefix = like_escape($wpdb->base_prefix);
+		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key LIKE '{$prefix}%meta-box-hidden%' OR meta_key LIKE '{$prefix}%closedpostboxes%' OR meta_key LIKE '{$prefix}%manage-%-columns-hidden%' OR meta_key LIKE '{$prefix}%meta-box-order%' OR meta_key LIKE '{$prefix}%screen_layout%'" );
+	}
 
 }
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 642984daae..aa351905a7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -15,7 +15,7 @@ $wp_version = '3.0-beta2-14576';
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 14217;
+$wp_db_version = 14595;
 
 /**
  * Holds the TinyMCE version