Index: bp-core/admin/bp-core-upgrade.php
===================================================================
--- bp-core/admin/bp-core-upgrade.php	(revision 3666)
+++ bp-core/admin/bp-core-upgrade.php	(working copy)
@@ -84,6 +84,9 @@
 	function add_steps() {
 		global $wp_rewrite;
 
+		if ( empty( $_POST['bp-admin-form'] ) && !empty( $_COOKIE['bp-wizard-step'] ) )
+			@setcookie( 'bp-wizard-step', '', time() - 3600, COOKIEPATH );
+
 		if ( 'new' == $this->setup_type ) {
 			// Setup wizard steps
 			$steps = array(