diff --git a/civicrm.php b/civicrm.php
index 25231f549298fc66c8cec737f3b3815ef536e4e7..72de393d5b3ea800b4ffbf36e4eafa0a4e6b3836 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -291,6 +291,7 @@ class CiviCRM_For_WordPress {
 
     // Set a one-time-only option
     add_option( 'civicrm_activation_in_progress', 'true' );
+    add_option('civicrm_setup_do_activation_redirect', true);
 
   }
 
@@ -321,6 +322,11 @@ class CiviCRM_For_WordPress {
 
     // Change option so this action never fires again
     update_option( 'civicrm_activation_in_progress', 'false' );
+    if (!isset($_GET['activate-multi'])) {
+      wp_redirect(admin_url("options-general.php?page=civicrm-install"));
+      exit;
+    }
+    update_option('civicrm_setup_do_activation_redirect', 'false');
 
   }