diff --git a/.pom.xml.swp b/.pom.xml.swp
new file mode 100644
index 00000000000..f89e01a40fa
Binary files /dev/null and b/.pom.xml.swp differ
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/device-api.jag b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/device-api.jag
index e49a8afba24..84a9b98bdc7 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/device-api.jag
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/device-api.jag
@@ -45,6 +45,7 @@ if (!user) {
         } else {
             queryString = "?" + queryString;
         }
+
         var deviceType = request.getParameter("deviceType"); // need a better solution here
         deviceTypeConfig = utility.getDeviceTypeConfig(deviceType);
         if (deviceTypeConfig && deviceTypeConfig.deviceType.downloadAgentUri) {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-protected-service-invokers.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-protected-service-invokers.js
index efcb3c6cae0..cfde7134b60 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-protected-service-invokers.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-protected-service-invokers.js
@@ -39,7 +39,7 @@ var invokers = function () {
     var constants = require("/app/modules/constants.js");
     var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
     var tokenUtil = require("/app/modules/oauth/token-handlers.js")["handlers"];
-
+    var tokenHandler = require("/app/modules/oauth/token-handler-utils.js")["utils"];
     /**
      * This method reads the token pair from the session and return the access token.
      * If the token pair is not set in the session, this will return null.
@@ -259,10 +259,12 @@ var invokers = function () {
         var wsRequest = new ws.WSRequest();
         var options = [];
         if (devicemgtProps["isOAuthEnabled"]) {
-            var accessToken = privateMethods.getAccessToken();
+            var adminUsername = devicemgtProps["adminUser"];
+            var accessToken = tokenHandler.getJwtToken(adminUsername);
+            var decoded = tokenHandler.encode(accessToken);
             if (accessToken) {
                 var authenticationHeaderName = String(constants["AUTHORIZATION_HEADER"]);
-                var authenticationHeaderValue = String(constants["BEARER_PREFIX"] + accessToken);
+                var authenticationHeaderValue = String(constants["BEARER_PREFIX"] + decoded);
                 var headers = [];
                 var oAuthAuthenticationData = {};
                 oAuthAuthenticationData.name = authenticationHeaderName;