diff --git a/src/server_mgr_main.py b/src/server_mgr_main.py
index eda27759..2431dccf 100755
--- a/src/server_mgr_main.py
+++ b/src/server_mgr_main.py
@@ -3929,8 +3929,6 @@ def provision_server(self):
 		    provision_params['keystone_tenant'] = cluster_params['keystone_tenant']
 		    provision_params['analytics_data_ttl'] = cluster_params['analytics_data_ttl']
 		    provision_params['phy_interface'] = server_params['interface_name']
-		    if 'xmpp_auth_enabled' in cluster_params:
-			provision_params['xmpp_auth_enabled'] = cluster_params['xmpp_auth_enabled']
 		    if 'contrail' in server:
 			provision_params['contrail_params']  = server['contrail']
 		    if 'gateway' in server and server['gateway']:
diff --git a/src/server_mgr_puppet.py b/src/server_mgr_puppet.py
index 5bff81c6..ed6c0909 100644
--- a/src/server_mgr_puppet.py
+++ b/src/server_mgr_puppet.py
@@ -260,7 +260,8 @@ def add_cluster_parameters(self, cluster_params):
             "use_certificates" : ["use_certs", "boolean"],
             "contrail_logoutput" : ["contrail_logoutput", "boolean"],
             "enable_ceilometer": ["enable_ceilometer", "boolean"],
-            "xmpp_auth_enabled": ["xmpp_auth_enabled", "boolean"]
+            "xmpp_dns_auth_enable": ["xmpp_dns_auth_enable", "boolean"],
+            "xmpp_auth_enable": ["xmpp_auth_enable", "boolean"]
         }
 
         data = ''