diff --git a/client/bindir/cloud-setup-management.in b/client/bindir/cloud-setup-management.in
index 5fb86488560..c82f7407318 100755
--- a/client/bindir/cloud-setup-management.in
+++ b/client/bindir/cloud-setup-management.in
@@ -13,9 +13,9 @@ if __name__ == '__main__':
     parser.add_option("--https", action="store_true", dest="https", help="Enable HTTPs connection of management server")
     (options, args) = parser.parse_args()
     if options.https:
-        glbEnv.mode = "HttpsServer"
-    else:
-        glbEnv.mode = "Server"
+        glbEnv.svrMode = "HttpsServer"
+
+    glbEnv.mode = "Server"
     
     print "Starting to configure CloudStack Management Server:"
     syscfg = sysConfigFactory.getSysConfigFactory(glbEnv)
diff --git a/python/lib/cloudutils/syscfg.py b/python/lib/cloudutils/syscfg.py
index c71d2edf734..801f83c6671 100644
--- a/python/lib/cloudutils/syscfg.py
+++ b/python/lib/cloudutils/syscfg.py
@@ -7,6 +7,8 @@ class sysConfigFactory:
             return sysConfigAgentFactory.getAgent(glbEnv)
         elif glbEnv.mode == "Server":
             return sysConfigServerFactory.getServer(glbEnv)
+        elif glbEnv.mode == "HttpsServer":
+            return sysConfigServerFactory.getServer(glbEnv)
         elif glbEnv.mode == "Db":
             return sysConfigDbFactory.getDb(glbEnv)
         else:
@@ -69,6 +71,9 @@ class sysConfig(object):
         return True
     
 class sysConfigAgent(sysConfig):
+    def __init__(self, env):
+        super(sysConfigServer, self).__init__(env)
+
     def check(self):
         if self.env.debug:
             return True