diff --git a/build/common/commands/migrate.py b/build/common/commands/migrate.py
index 70471981..06280a0f 100644
--- a/build/common/commands/migrate.py
+++ b/build/common/commands/migrate.py
@@ -42,8 +42,8 @@ def migrate_sites(maintenance_mode=False):
         finally:
             frappe.destroy()
 
-    if maintenance_mode:
-        set_maintenance_mode(False)
+    # Disable maintenance mode after migration
+    set_maintenance_mode(False)
 
 
 def main():
diff --git a/build/common/commands/new.py b/build/common/commands/new.py
index 82c0ab7b..4771b21d 100644
--- a/build/common/commands/new.py
+++ b/build/common/commands/new.py
@@ -66,7 +66,7 @@ def main():
     os.system(command)
 
     # Set db password
-    command = mysql_command + "\"UPDATE mysql.user SET authentication_string = PASSWORD('{db_password}') WHERE User = \'{db_name}\' AND Host = \'%\';\"".format(
+    command = mysql_command + "\"ALTER USER '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;\"".format(
         db_name=site_config.get('db_name'),
         db_password=site_config.get('db_password')
     )