diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
index 2d5b88e35b..8baf1b32e5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
@@ -45,7 +45,7 @@ var modalPopupContent = modalPopup + " .modal-content";
 var body = "body";
 
 /**
- * 
+ *
  * Fires the res_text when ever a data table redraw occurs making
  * the font icons change the size to respective screen resolution.
  *
@@ -266,7 +266,7 @@ function loadUsers() {
             "recordsFiltered": data.count,
             "data": objects
         };
-
+        console.log(json);
         return JSON.stringify(json);
     };
 
@@ -282,8 +282,8 @@ function loadUsers() {
             class: "remove-padding icon-only content-fill",
             data: null,
             defaultContent: '<div class="thumbnail icon">' +
-                '<i class="square-element text fw fw-user" style="font-size: 74px;"></i>' +
-                '</div>'
+            '<i class="square-element text fw fw-user" style="font-size: 74px;"></i>' +
+            '</div>'
         },
         {
             class: "fade-edge",
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/templates/notification-listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/templates/notification-listing.hbs
index 2206689845..4f98c03e9b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/templates/notification-listing.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/templates/notification-listing.hbs
@@ -57,7 +57,7 @@
                     <tr data-type="selectable" data-id="{{id}}">
                         <td  data-display="{{description}}" data-grid-label="Description">{{description}}</td>
                         <td style="text-align: center;">
-                            <a href="{{appContext}}/device/{{deviceType}}?id={{deviceIdentifier}}" data-click-event="remove-form">
+                            <a href="device/{{deviceType}}?id={{deviceIdentifier}}" data-click-event="remove-form">
                                  <span class="fw-stack">
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                     <i class="fw fw-view fw-stack-1x"></i>