diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
index c6ed7da1bdb..8de168cceae 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
@@ -463,7 +463,13 @@ var userModule = function () {
     publicMethods.isAuthorized = function (permission) {
         var carbon = require("carbon");
         var carbonServer = application.get("carbonServer");
-        var carbonUser = session.get(constants.USER_SESSION_KEY);
+        var carbonUser;
+        try {
+            carbonUser = session.get(constants.USER_SESSION_KEY);
+        } catch (e) {
+           log.error("User object was not found in the session");
+           carbonUser = null;
+        }
         var utility = require('/app/modules/utility.js').utility;
         if (!carbonUser) {
             log.error("User object was not found in the session");
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.hbs
index 90ec4bf89cd..f526cc03a33 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.hbs
@@ -78,7 +78,7 @@
                             </a>
                         {{/if}}
                                 <!--suppress HtmlUnknownTarget -->
-                                {{#unless isCloud}}
+                               
                                     <a href="{{@app.context}}/group/add">
                                 <span class="fw-stack">
                                     <i class="fw fw-circle-outline fw-stack-2x"></i>
@@ -86,7 +86,7 @@
                                 </span>
                                 Add
                             </a>
-                                {{/unless}}
+                               
                         </span>
                         </div>
                     </div>
@@ -144,7 +144,7 @@
                             </a>
                         {{/if}}
                                 <!--suppress HtmlUnknownTarget -->
-                                {{#unless isCloud}}
+                               
                                     <a href="{{@app.context}}/policy/add">
                                 <span class="fw-stack">
                                     <i class="fw fw-circle-outline fw-stack-2x"></i>
@@ -152,7 +152,7 @@
                                 </span>
                                 Add
                             </a>
-                                {{/unless}}
+                             
                         </span>
                         </div>
                     </div>
@@ -197,4 +197,4 @@
             </h1>
         {{/if}}
     </div>
-{{/zone}}
\ No newline at end of file
+{{/zone}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
index d2b7521ff72..98749decd75 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
@@ -179,7 +179,7 @@ function loadRoles() {
                     '<span class="hidden-xs hidden-on-grid-view">Edit Permission</span>' +
                     '</a>';
 
-                    car removeLink = '<a data-role="' + data.name + '" ' +
+                    var removeLink = '<a data-role="' + data.name + '" ' +
                     'data-click-event="remove-form" ' +
                     'class="btn padding-reduce-on-grid-view remove-role-link">' +
                     '<span class="fw-stack">' +
@@ -189,7 +189,7 @@ function loadRoles() {
                     '<span class="hidden-xs hidden-on-grid-view">Remove</span>' +
                     '</a>';
 
-                if (!isCloud){
+                if (!isCloud) {
                     innerhtml = editLink + editPermissionLink + removeLink;
                 }
                 return innerhtml;