diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/user-api.jag b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/user-api.jag
index 24aad8ece92..a9665ac04ce 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/user-api.jag
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/user-api.jag
@@ -46,10 +46,7 @@ if (uriMatcher.match("/{context}/api/user/authenticate")) {
                 if (log.isDebugEnabled()) {
                     log.debug("User Logged In : " + user);
                 }
-                apiWrapperUtil.setupAccessTokenPair("password", {
-                    "username": username,
-                    "password": password
-                });
+                apiWrapperUtil.setupAccessTokenPairByPasswordGrantType(username, password);
             }, function () {
                 response = responseProcessor.buildSuccessResponse(response, 200, {'sessionId': session.getId()});
             });
@@ -68,7 +65,8 @@ if (uriMatcher.match("/{context}/api/user/authenticate")) {
             if (log.isDebugEnabled()) {
                 log.debug("User Logged In : " + user);
             }
-            apiWrapperUtil.setupAccessTokenPair("password", {"username": username, "password": password});
+
+            apiWrapperUtil.setupAccessTokenPairByPasswordGrantType(username, password);
             var permissions = userModule.getUIPermissions();
             if (permissions.VIEW_DASHBOARD) {
                 response.sendRedirect(constants.WEB_APP_CONTEXT);
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/operation.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/operation.js
index 3b1e11a9c66..98890b9a192 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/operation.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/operation.js
@@ -21,7 +21,7 @@ var operationModule = function () {
     var utility = require('/app/modules/utility.js').utility;
     var constants = require('/app/modules/constants.js');
     var devicemgtProps = require("/app/conf/reader/main.js")["conf"];
-    var serviceInvokers = require("/app/modules/oauth/token-protected-service-invokers.js")["invokers"];;
+    var serviceInvokers = require("/app/modules/oauth/token-protected-service-invokers.js")["invokers"];
 
     var publicMethods = {};
     var privateMethods = {};