diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
index b74f3d4518..d0a421755a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
@@ -13,7 +13,7 @@
     "iOSConfigRoot" : "%https.ip%/ios-enrollment/",
     "iOSAPIRoot" : "%https.ip%/ios/",
     "adminService": "%https.ip%",
-    "apimgt-gateway": false,
+    "gatewayEnabled": false,
     "oauthProvider": {
         "appRegistration": {
             "appType": "webapp",
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-handlers.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-handlers.js
index 9c969f4ab1..d9d51101c1 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-handlers.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-handlers.js
@@ -138,7 +138,7 @@ var handlers = function () {
                 "client credentials to session context. No username of logged in user is found as " +
                     "input - setUpEncodedTenantBasedClientAppCredentials(x)");
         } else {
-            if (devicemgtProps["apimgt-gateway"]) {
+            if (devicemgtProps["gatewayEnabled"]) {
 				var tenantBasedClientAppCredentials = tokenUtil.getTenantBasedClientAppCredentials(username);
 				if (!tenantBasedClientAppCredentials) {
 					throw new Error("{/app/modules/oauth/token-handlers.js} Could not set up encoded tenant " +
@@ -176,7 +176,7 @@ var handlers = function () {
                 "client credentials to session context. No username of logged in user is found as " +
                 "input - setUpEncodedTenantBasedWebSocketClientAppCredentials(x)");
         } else {
-            if (devicemgtProps["apimgt-gateway"]) {
+            if (devicemgtProps["gatewayEnabled"]) {
                 var tenantBasedWebSocketClientAppCredentials
                     = tokenUtil.getTenantBasedWebSocketClientAppCredentials(username);
                 if (!tenantBasedWebSocketClientAppCredentials) {