diff --git a/xCAT-server/sbin/db2sqlsetup b/xCAT-server/sbin/db2sqlsetup
index a6e7f656a..55ecd940e 100755
--- a/xCAT-server/sbin/db2sqlsetup
+++ b/xCAT-server/sbin/db2sqlsetup
@@ -244,8 +244,6 @@ if (($::INIT) && ($::xcatrunningdb2 == 0))
 {
     if ($::SERVER)
     {    # setting up server
-            # shutdown the xcatd daemon while migrating
-        &shutdownxcatd;
 
         #
         # Backup current database
@@ -262,6 +260,8 @@ if (($::INIT) && ($::xcatrunningdb2 == 0))
         }
 
         &backupxcatdb;
+        # shutdown the xcatd daemon while migrating 
+        &shutdownxcatd;
 
         #
         #  Get MN name from site.master in backed up database
@@ -488,7 +488,7 @@ sub backupxcatdb
         }
 
         # back it up
-        my $cmd = "XCATBYPASS=1 dumpxCATdb -p $::backupdir";
+        my $cmd = " dumpxCATdb -p $::backupdir";
         xCAT::Utils->runcmd($cmd, 0);
         if ($::RUNCMD_RC != 0)
         {