diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
index bc3d15574..1fb5660c0 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
@@ -774,7 +774,8 @@ var operationModule = function () {
                 operationType = operationTypeConstants["PROFILE"];
                 payload = {
                     "operation": {
-                        "message" : operationData["message"]
+                        "messageTitle": operationData["messageTitle"],
+                        "messageText": operationData["messageText"]
                     }
                 };
                 break;
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/modules/oauth/token-handler-utils.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/modules/oauth/token-handler-utils.js
index 2ed241d0d..bd1ecb2f9 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/modules/oauth/token-handler-utils.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/modules/oauth/token-handler-utils.js
@@ -291,5 +291,38 @@ var utils = function () {
         }
     };
 
+    publicMethods["getTokenPairAndScopesByPasswordGrantType"] = function (username, password, encodedClientAppCredentials, scopes) {
+        if (!username || !password || !encodedClientAppCredentials || !scopes) {
+            log.error("{/app/modules/oauth/token-handler-utils.js} Error in retrieving access token by password " +
+                "grant type. No username, password, encoded client app credentials or scopes are " +
+                    "found - getTokenPairAndScopesByPasswordGrantType(a, b, c, d)");
+            return null;
+        } else {
+            // calling oauth provider token service endpoint
+            var requestURL = deviceMgtProps["oauthProvider"]["tokenServiceURL"];
+            var requestPayload = "grant_type=password&username=" +
+                username + "&password=" + password + "&scope=" + scopes;
+
+            var xhr = new XMLHttpRequest();
+            xhr.open("POST", requestURL, false);
+            xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+            xhr.setRequestHeader("Authorization", "Basic " + encodedClientAppCredentials);
+            xhr.send(requestPayload);
+
+            if (xhr["status"] == 200 && xhr["responseText"]) {
+                var responsePayload = parse(xhr["responseText"]);
+                var tokenData = {};
+                tokenData["accessToken"] = responsePayload["access_token"];
+                tokenData["refreshToken"] = responsePayload["refresh_token"];
+                tokenData["scopes"] = responsePayload["scope"];
+                return tokenData;
+            } else {
+                log.error("{/app/modules/oauth/token-handler-utils.js} Error in retrieving access token " +
+                    "by password grant type - getTokenPairAndScopesByPasswordGrantType(a, b, c, d)");
+                return null;
+            }
+        }
+    };
+
     return publicMethods;
 }();
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/modules/oauth/token-handlers.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/modules/oauth/token-handlers.js
index d16304606..9fb3198e0 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/modules/oauth/token-handlers.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/modules/oauth/token-handlers.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
  * WSO2 Inc. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -53,7 +53,7 @@ var handlers = function () {
                     stringOfScopes += entry + " ";
                 });
                 tokenData = tokenUtil.
-                    getTokenPairByPasswordGrantType(username,
+                    getTokenPairAndScopesByPasswordGrantType(username,
                         encodeURIComponent(password), encodedClientAppCredentials, stringOfScopes);
                 if (!tokenData) {
                     throw new Error("{/app/modules/oauth/token-handlers.js} Could not set up " +
@@ -90,7 +90,7 @@ var handlers = function () {
                 var tokenData;
                 // accessTokenPair will include current access token as well as current refresh token
                 tokenData = tokenUtil.
-                    getTokenPairBySAMLGrantType(samlToken, encodedClientAppCredentials, "PRODUCTION");
+                    getTokenPairAndScopesBySAMLGrantType(samlToken, encodedClientAppCredentials, "PRODUCTION");
                 if (!tokenData) {
                     throw new Error("{/app/modules/oauth/token-handlers.js} Could not set up token " +
                         "pair by password grant type. Error in token " +
@@ -142,26 +142,35 @@ var handlers = function () {
                     "client credentials to session context as the server is unable to obtain " +
                         "dynamic client credentials - setUpEncodedTenantBasedClientAppCredentials(x)");
             } else {
-                var jwtToken = tokenUtil.getAccessTokenByJWTGrantType(dynamicClientAppCredentials);
-                if (!jwtToken) {
-                    throw new Error("{/app/modules/oauth/token-handlers.js} Could not set up encoded tenant based " +
+                if (devicemgtProps["apimgt-gateway"]) {
+                    var jwtToken = tokenUtil.getAccessTokenByJWTGrantType(dynamicClientAppCredentials);
+                    if (!jwtToken) {
+                        throw new Error("{/app/modules/oauth/token-handlers.js} Could not set up encoded tenant based " +
                         "client credentials to session context as the server is unable to obtain " +
-                            "a jwt token - setUpEncodedTenantBasedClientAppCredentials(x)");
-                } else {
-                    var tenantBasedClientAppCredentials = tokenUtil.
-                        getTenantBasedClientAppCredentials(username, jwtToken);
-                    if (!tenantBasedClientAppCredentials) {
-                        throw new Error("{/app/modules/oauth/token-handlers.js} Could not set up encoded tenant " +
-                            "based client credentials to session context as the server is unable " +
-                                "to obtain such credentials - setUpEncodedTenantBasedClientAppCredentials(x)");
+                        "a jwt token - setUpEncodedTenantBasedClientAppCredentials(x)");
                     } else {
-                        var encodedTenantBasedClientAppCredentials =
-                            tokenUtil.encode(tenantBasedClientAppCredentials["clientId"] + ":" +
+                        var tenantBasedClientAppCredentials = tokenUtil.
+                            getTenantBasedClientAppCredentials(username, jwtToken);
+                        if (!tenantBasedClientAppCredentials) {
+                            throw new Error("{/app/modules/oauth/token-handlers.js} Could not set up encoded tenant " +
+                            "based client credentials to session context as the server is unable " +
+                            "to obtain such credentials - setUpEncodedTenantBasedClientAppCredentials(x)");
+                        } else {
+                            var encodedTenantBasedClientAppCredentials =
+                                tokenUtil.encode(tenantBasedClientAppCredentials["clientId"] + ":" +
                                 tenantBasedClientAppCredentials["clientSecret"]);
-                        // setting up encoded tenant based client credentials to session context.
-                        session.put(constants["ENCODED_TENANT_BASED_CLIENT_APP_CREDENTIALS"],
-                            encodedTenantBasedClientAppCredentials);
+                            // setting up encoded tenant based client credentials to session context.
+                            session.put(constants["ENCODED_TENANT_BASED_CLIENT_APP_CREDENTIALS"],
+                                encodedTenantBasedClientAppCredentials);
+                        }
                     }
+                } else {
+                    var encodedTenantBasedClientAppCredentials =
+                        tokenUtil.encode(dynamicClientAppCredentials["clientId"] + ":" +
+                        dynamicClientAppCredentials["clientSecret"]);
+                    // setting up encoded tenant based client credentials to session context.
+                    session.put(constants["ENCODED_TENANT_BASED_CLIENT_APP_CREDENTIALS"],
+                        encodedTenantBasedClientAppCredentials);
                 }
             }
         }