diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js
index 30fcb20d4e..ced06d0491 100644
--- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js
@@ -689,26 +689,29 @@ function intializeWebsocketUrls() {
     wso2.gadgets.state.getGlobalState(function (state) {
         deviceId = state.device.id;
         deviceType = state.device.type;
+        var hostname = window.parent.location.hostname;
+        var port = window.parent.location.port;
         if (deviceId && deviceType) {
-            //TODO need to get the token
             wso2.gadgets.identity.getUsername(function (username) {
-                $.getJSON("/portal/store/carbon.super/fs/gadget/geo-dashboard/controllers/get_server_info.jag?username=" + username, function (data) {
-                    webSocketURL = 'wss://' + data.ip + ':' + data.httpsPort + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance
-                            .CEP_WEB_SOCKET_OUTPUT_ADAPTOR_WEBAPP_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions
-                            .constance.TENANT_INDEX + ApplicationOptions.constance.PATH_SEPARATOR + data.user.domain +
-                        ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance
-                            .CEP_WEB_SOCKET_OUTPUT_ADAPTOR_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance.VERSION
-                        + "?deviceId=" + deviceId + "&deviceType=" + deviceType;
-                    alertWebSocketURL = 'wss://' + data.ip + ':' + data.httpsPort + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance
-                            .CEP_WEB_SOCKET_OUTPUT_ADAPTOR_WEBAPP_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions
-                            .constance.TENANT_INDEX + ApplicationOptions.constance.PATH_SEPARATOR + data.user.domain +
-                        ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance
-                            .CEP_ON_ALERT_WEB_SOCKET_OUTPUT_ADAPTOR_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance.VERSION
-                        + "?deviceId=" + deviceId + "&deviceType=" + deviceType;
-                    document.cookie = "websocket-token=619e6170-10e8-31f0-904b-b7770d53e545; path=/";
-                    $("#proximity_alert").hide();
-                    initializeWebSocket();
-                    initializeOnAlertWebSocket();
+                wso2.gadgets.identity.getAccessToken(function (accessToken) {
+                    $.getJSON("/portal/store/carbon.super/fs/gadget/geo-dashboard/controllers/get_server_info.jag?username=" + username, function (data) {
+                        webSocketURL = 'wss://' + hostname + ':' + port + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance
+                                .CEP_WEB_SOCKET_OUTPUT_ADAPTOR_WEBAPP_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions
+                                .constance.TENANT_INDEX + ApplicationOptions.constance.PATH_SEPARATOR + data.user.domain +
+                            ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance
+                                .CEP_WEB_SOCKET_OUTPUT_ADAPTOR_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance.VERSION
+                            + "?deviceId=" + deviceId + "&deviceType=" + deviceType;
+                        alertWebSocketURL = 'wss://' + hostname + ':' + port + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance
+                                .CEP_WEB_SOCKET_OUTPUT_ADAPTOR_WEBAPP_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions
+                                .constance.TENANT_INDEX + ApplicationOptions.constance.PATH_SEPARATOR + data.user.domain +
+                            ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance
+                                .CEP_ON_ALERT_WEB_SOCKET_OUTPUT_ADAPTOR_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance.VERSION
+                            + "?deviceId=" + deviceId + "&deviceType=" + deviceType;
+                        document.cookie = "websocket-token=" + accessToken + "; path=/";
+                        $("#proximity_alert").hide();
+                        initializeWebSocket();
+                        initializeOnAlertWebSocket();
+                    });
                 });
             });
         } else {
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseClientAsyncExecutor.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseClientAsyncExecutor.java
index 8a31fdf9c7..9289a29a80 100755
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseClientAsyncExecutor.java
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseClientAsyncExecutor.java
@@ -116,7 +116,7 @@ public class SenseClientAsyncExecutor extends AsyncTask<String, Void, Map<String
             TokenIssuerService tokenIssuerService = Feign.builder().client(disableHostnameVerification).requestInterceptor(
                     new BasicAuthRequestInterceptor(apiApplicationKey.getConsumerKey(), apiApplicationKey.getConsumerSecret()))
                     .contract(new JAXRSContract()).encoder(new JacksonEncoder()).decoder(new JacksonDecoder())
-                    .target(TokenIssuerService.class, endpoint + SenseConstants.TOKEN_ISSUER_CONTEXT);
+                    .target(TokenIssuerService.class, endpoint);
             accessTokenInfo = tokenIssuerService.getToken(PASSWORD_GRANT_TYPE, username, password, "device_" + deviceId);
 
             //DeviceRegister
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/res/layout/activity_register.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/res/layout/activity_register.xml
index 543142b9c6..f968318fc9 100755
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/res/layout/activity_register.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/res/layout/activity_register.xml
@@ -39,7 +39,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" android:hint="@string/hostname"
                 android:id="@+id/hostname"
-                android:text="https://localhost:9443"
+                android:text="https://localhost:8243"
                 android:inputType="text"
                 android:maxLines="1" android:singleLine="true"/>
 
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/res/values/strings.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/res/values/strings.xml
index 62002d6055..e3cf8a1e12 100755
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/res/values/strings.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name">WSO2-SenseAgent</string>
     <string name="title_activity_sense_settings">Sense Settings</string>
-    <string name="hostname">Server URL https://host:9443</string>
+    <string name="hostname">Server URL https://host:8243</string>
     <string name="speakup">Speakup to capture the words</string>
     <string name="action_settings">DeEnroll</string>
     <string name="title_activity_activity_select_sensor">ActivitySelectSensor</string>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/api/user-api.jag b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/api/user-api.jag
index b038e66ad5..2a36433ded 100755
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/api/user-api.jag
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/api/user-api.jag
@@ -121,9 +121,9 @@ if (uriMatcher.match("/{context}/api/user/authenticate")) {
         } else {
             userRoles = String(addUserFormData.userRoles).split(",");
         }
-        if (username.length < devicemgtProps.usernameLength) {
-            log.error("Username Must be between 1 and " + devicemgtProps.usernameLength + " characters long");
-            result = "Username Must be between 1 and " + devicemgtProps.usernameLength + " characters long";
+        if (username.length < devicemgtProps.userValidationConfig.usernameLength) {
+            log.error("Username Must be between 1 and " + devicemgtProps.userValidationConfig.usernameLength + " characters long");
+            result = "Username Must be between 1 and " + devicemgtProps.userValidationConfig.usernameLength + " characters long";
         } else {
             try {
                 result = userModule.addUser(username, firstname, lastname, emailAddress, userRoles);
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/config.json b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/config.json
index 75943b23b9..3c82027057 100755
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/config.json
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/config.json
@@ -1,6 +1,5 @@
 {
     "appContext" : "/android-web-agent/",
-    "apiContext" : "api",
     "httpsURL" : "%https.ip%",
     "httpURL" : "%http.ip%",
     "enrollmentDir": "/android-web-agent/enrollment",
@@ -24,7 +23,9 @@
         "tokenServiceURL": "%https.ip%/oauth2/token"
     },
     "adminUser":"admin",
-    "usernameLength":30,
+    "userValidationConfig" : {
+        "usernameLength":30
+    },
     "device" : {
         "ios" : {
             "location" : "%http.ip%/android-web-agent/public/mdm.page.enrollments.ios.download-agent/asset/ios-agent.ipa",
@@ -35,16 +36,6 @@
     },
     "androidAgentApp" : "android-agent.apk",
     "windowsConfigRoot" : "%http.ip%/api/device-mgt/windows/v1.0/services/federated/bst/authentication",
-    "ssoConfiguration" : {
-        "enabled" : false,
-        "issuer" : "mdm",
-        "appName" : "admin_android-web-agent",
-        "identityProviderURL" : "%https.ip%/sso/samlsso.jag",
-        "responseSigningEnabled" : "true",
-        "keyStorePassword" : "wso2carbon",
-        "identityAlias" : "wso2carbon",
-        "keyStoreName" : "/repository/resources/security/wso2carbon.jks"
-    },
     "generalConfig" : {
         "host" : "%http.ip%",
         "companyName" : "WSO2 Enterprise Mobility Manager",
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/api/user-api.jag b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/api/user-api.jag
index b038e66ad5..2a36433ded 100755
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/api/user-api.jag
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/api/user-api.jag
@@ -121,9 +121,9 @@ if (uriMatcher.match("/{context}/api/user/authenticate")) {
         } else {
             userRoles = String(addUserFormData.userRoles).split(",");
         }
-        if (username.length < devicemgtProps.usernameLength) {
-            log.error("Username Must be between 1 and " + devicemgtProps.usernameLength + " characters long");
-            result = "Username Must be between 1 and " + devicemgtProps.usernameLength + " characters long";
+        if (username.length < devicemgtProps.userValidationConfig.usernameLength) {
+            log.error("Username Must be between 1 and " + devicemgtProps.userValidationConfig.usernameLength + " characters long");
+            result = "Username Must be between 1 and " + devicemgtProps.userValidationConfig.usernameLength + " characters long";
         } else {
             try {
                 result = userModule.addUser(username, firstname, lastname, emailAddress, userRoles);
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/config.json b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/config.json
index d02ddd7404..7e4a733cda 100755
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/config.json
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/config.json
@@ -1,6 +1,5 @@
 {
     "appContext" : "/windows-web-agent/",
-    "apiContext" : "api",
     "httpsURL" : "%https.ip%",
     "httpURL" : "%http.ip%",
     "enrollmentDir": "/windows-web-agent/enrollment",
@@ -24,7 +23,9 @@
         "tokenServiceURL": "%https.ip%/oauth2/token"
     },
     "adminUser":"admin",
-    "usernameLength":30,
+    "userValidationConfig": {
+        "usernameLength":30
+    },
     "device" : {
         "ios" : {
             "location" : "%http.ip%/windows-web-agent/public/mdm.page.enrollments.ios.download-agent/asset/ios-agent.ipa",
@@ -35,16 +36,6 @@
     },
     "androidAgentApp" : "android-agent.apk",
     "windowsConfigRoot" : "%http.ip%/api/device-mgt/windows/v1.0/federated/bst/authentication",
-    "ssoConfiguration" : {
-        "enabled" : false,
-        "issuer" : "mdm",
-        "appName" : "admin_windows-web-agent",
-        "identityProviderURL" : "%https.ip%/sso/samlsso.jag",
-        "responseSigningEnabled" : "true",
-        "keyStorePassword" : "wso2carbon",
-        "identityAlias" : "wso2carbon",
-        "keyStoreName" : "/repository/resources/security/wso2carbon.jks"
-    },
     "generalConfig" : {
         "host" : "%http.ip%",
         "companyName" : "WSO2 Enterprise Mobility Manager",
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/modules/oauth/token-handlers.js b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/modules/oauth/token-handlers.js
index bff0f143fa..f18f4c2356 100755
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/modules/oauth/token-handlers.js
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/modules/oauth/token-handlers.js
@@ -142,7 +142,7 @@ var handlers = function () {
                 "client credentials to session context as the server is unable to obtain " +
                 "dynamic client credentials - setUpEncodedTenantBasedClientAppCredentials(x)");
             } else {
-                if (devicemgtProps["apimgt-gateway"]) {
+                if (devicemgtProps["gatewayEnabled"]) {
                     var jwtToken = tokenUtil.getAccessTokenByJWTGrantType(dynamicClientAppCredentials);
                     if (!jwtToken) {
                         throw new Error("{/app/modules/oauth/token-handlers.js} Could not set up encoded tenant based " +
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.invoke-agent/invoke-agent.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.invoke-agent/invoke-agent.hbs
index 18375a801b..a3af675cae 100755
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.invoke-agent/invoke-agent.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.invoke-agent/invoke-agent.hbs
@@ -32,7 +32,7 @@ under the License. --}}
     {{
         unit "mdm.unit.wizard-stepper"
         steps = "Start Workplace,
-        Login to Enterprise Mobility Manager,
+        Login to WSO2 IoT Server,
         Accept End User License Agreement"
         currentStep = "Start Workplace"
         currentStepIndex = 0
@@ -40,7 +40,7 @@ under the License. --}}
     Start the Workplace app to continue device enrollment.
     <br class="c-both" />
     <br class="c-both" />
-    Setting up a Workplace account with WSO2 Enterprise Mobility Manager
+    Setting up a Workplace account with WSO2 IoT Server
     will offer you company policies, certificates and apps that help you connect
     to your business.
     <br class="c-both" />
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.license/license.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.license/license.hbs
index e51813f428..6d0c5147e4 100755
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.license/license.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.license/license.hbs
@@ -32,7 +32,7 @@ under the License. --}}
     {{
         unit "mdm.unit.wizard-stepper"
         steps = "Start Workplace,
-        Login to Enterprise Mobility Manager,
+        Login to WSO2 IoT Server,
         Accept End User License Agreement"
         currentStep = "Accept End User License Agreement"
         currentStepIndex = 2
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.login/login.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.login/login.hbs
index 458c63acc8..90848f7477 100755
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.login/login.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.login/login.hbs
@@ -25,7 +25,7 @@ under the License. --}}
     }}
 {{/zone}}
 {{!-- Inputting content into defined zones in enrollment layout --}}
-{{unit "mdm.unit.ui.title" pageTitle="Windows Phone Enrollment | Login to Enterprise Mobility Manager"}}
+{{unit "mdm.unit.ui.title" pageTitle="Windows Phone Enrollment | Login to WSO2 IoT Server"}}
 {{#zone "headerTitle"}}
     Windows Phone Enrollment
 {{/zone}}
@@ -33,9 +33,9 @@ under the License. --}}
     {{
         unit "mdm.unit.wizard-stepper"
         steps = "Start Workplace,
-        Login to Enterprise Mobility Manager,
+        Login to WSO2 IoT Server,
         Accept End User License Agreement"
-        currentStep = "Login to Enterprise Mobility Manager"
+        currentStep = "Login to WSO2 IoT Server"
         currentStepIndex = 1
     }}
     {{