diff --git a/cli/cliParser.py b/cli/cliParser.py
index bd7ef4231..1fa1bf2c2 100755
--- a/cli/cliParser.py
+++ b/cli/cliParser.py
@@ -63,6 +63,7 @@ class cliParser:
         parser.add_argument('--selectedACL', help='Select ACL while creating user.')
         parser.add_argument('--securityLevel', help='Set security level while creating user.')
         parser.add_argument('--state', help='State value used in user suspension.')
+        parser.add_argument('--licenseKey', help='LSWS License Key')
 
 
         ### WP Install
diff --git a/serverStatus/serverStatusUtil.py b/serverStatus/serverStatusUtil.py
index 02327b2b3..68bbfaaca 100755
--- a/serverStatus/serverStatusUtil.py
+++ b/serverStatus/serverStatusUtil.py
@@ -1,5 +1,6 @@
 #!/usr/local/CyberCP/bin/python
 import os,sys
+import time
 sys.path.append('/usr/local/CyberCP')
 import django
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
@@ -15,12 +16,21 @@ from plogical.virtualHostUtilities import virtualHostUtilities
 from plogical.sslUtilities import sslUtilities
 from plogical.vhost import vhost
 from shutil import ignore_patterns
+import threading as multi
 
 
-class ServerStatusUtil:
+class ServerStatusUtil(multi.Thread):
+
     lswsInstallStatusPath = '/home/cyberpanel/switchLSWSStatus'
     serverRootPath = '/usr/local/lsws/'
 
+    def __init__(self, key):
+        multi.Thread.__init__(self)
+        self.key = key
+
+    def run(self):
+        self.switchTOLSWS(self.key)
+
     @staticmethod
     def executioner(command, statusFile):
         try:
@@ -383,26 +393,28 @@ class ServerStatusUtil:
     def switchTOLSWSCLI(licenseKey):
         try:
 
-            ServerStatusUtil.switchTOLSWS(licenseKey)
+            ssu = ServerStatusUtil(licenseKey)
+            ssu.start()
 
-            command = 'sudo cat ' + ServerStatusUtil.lswsInstallStatusPath
-            output = ProcessUtilities.outputExecutioner(command)
-
-            if output.find('[404]') > -1:
-                command = "sudo rm -f " + ServerStatusUtil.lswsInstallStatusPath
-                ProcessUtilities.popenExecutioner(command)
-                data_ret = {'status': 1, 'abort': 1, 'requestStatus': output, 'installed': 0}
-                print(str(data_ret))
-                return 0
-            elif output.find('[200]') > -1:
-                command = "sudo rm -f " + ServerStatusUtil.lswsInstallStatusPath
-                ProcessUtilities.popenExecutioner(command)
-                data_ret = {'status': 1, 'abort': 1, 'requestStatus': 'Successfully converted.', 'installed': 1}
-                print(str(data_ret))
-                return 1
-            else:
-                data_ret = {'status': 1, 'abort': 0, 'requestStatus': output, 'installed': 0}
-                print(output)
+            while(True):
+                command = 'sudo cat ' + ServerStatusUtil.lswsInstallStatusPath
+                output = ProcessUtilities.outputExecutioner(command)
+                if output.find('[404]') > -1:
+                    command = "sudo rm -f " + ServerStatusUtil.lswsInstallStatusPath
+                    ProcessUtilities.popenExecutioner(command)
+                    data_ret = {'status': 1, 'abort': 1, 'requestStatus': output, 'installed': 0}
+                    print(str(data_ret))
+                    return 0
+                elif output.find('[200]') > -1:
+                    command = "sudo rm -f " + ServerStatusUtil.lswsInstallStatusPath
+                    ProcessUtilities.popenExecutioner(command)
+                    data_ret = {'status': 1, 'abort': 1, 'requestStatus': 'Successfully converted.', 'installed': 1}
+                    print(str(data_ret))
+                    return 1
+                else:
+                    data_ret = {'status': 1, 'abort': 0, 'requestStatus': output, 'installed': 0}
+                    #print(output)
+                    time.sleep(2)
 
         except BaseException as msg:
             logging.CyberCPLogFileWriter.writeToFile(str(msg))