diff --git a/plogical/upgrade.py b/plogical/upgrade.py
index 2ace0c409..29665a48d 100755
--- a/plogical/upgrade.py
+++ b/plogical/upgrade.py
@@ -2528,12 +2528,18 @@ vmail
         Upgrade.setupCLI()
         Upgrade.someDirectories()
         Upgrade.installLSCPD(branch)
-        Upgrade.GeneralMigrations()
+
+        ### General migrations are not needed any more
+
+        # Upgrade.GeneralMigrations()
+
         # Upgrade.p3()
 
-        if os.path.exists(postfixPath):
-            Upgrade.upgradeDovecot()
-        time.sleep(3)
+        ## Also disable email service upgrade
+
+        # if os.path.exists(postfixPath):
+        #     Upgrade.upgradeDovecot()
+
 
         ## Upgrade version
 
@@ -2541,7 +2547,10 @@ vmail
 
         ##
 
-        Upgrade.upgradeVersion()
+        ### Disable version upgrade too
+
+        # Upgrade.upgradeVersion()
+
         Upgrade.UpdateMaxSSLCons()
 
         ## Update LSCPD PHP
diff --git a/userManagment/static/userManagment/userManagment.js b/userManagment/static/userManagment/userManagment.js
index f706d487f..1f40f4829 100755
--- a/userManagment/static/userManagment/userManagment.js
+++ b/userManagment/static/userManagment/userManagment.js
@@ -1723,6 +1723,7 @@ app.controller('listTableUsers', function ($scope, $http) {
     };
 
     $scope.controlUserState = function (userName, state) {
+
         $scope.cyberpanelLoading = false;
 
         var url = "/users/controlUserState";