diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java
index ce403fa2813..356aa7afef0 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java
@@ -21,7 +21,6 @@ package org.wso2.carbon.device.mgt.jaxrs.service.api;
 import io.swagger.annotations.*;
 import org.wso2.carbon.apimgt.annotations.api.API;
 import org.wso2.carbon.apimgt.annotations.api.Permission;
-import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.jaxrs.beans.*;
 
 import javax.ws.rs.*;
@@ -471,7 +470,7 @@ public interface UserManagementService {
                             "Server error occurred while updating credentials of the user.",
                     response = ErrorResponse.class)
     })
-    @Permission(name = "View Users", permission = "/device-mgt/users/view")
+    @Permission(name = "Reset user password", permission = "/login")
     Response resetPassword(
             @ApiParam(
                     name = "username",
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/public/js/user-menu.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/public/js/user-menu.js
index 34bb5c1ddd0..a622f40543c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/public/js/user-menu.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/public/js/user-menu.js
@@ -1,3 +1,21 @@
+/*
+ * 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
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 /**
  * Checks if provided input is valid against RegEx input.
  *
@@ -21,34 +39,33 @@ $(document).ready(function () {
         showPopup();
 
         $("a#change-password-yes-link").click(function () {
-            var oldPassword = $("#old-password").val();
+            var currentPassword = $("#current-password").val();
             var newPassword = $("#new-password").val();
-            var confirmedPassword = $("#confirmed-password").val();
+            var retypedNewPassword = $("#retyped-new-password").val();
             var user = $("#user").val();
 
-            var errorMsgWrapper = "#notification-error-msg";
-            var errorMsg = "#notification-error-msg span";
-            if (!oldPassword) {
-                $(errorMsg).text("Old password is a required field. It cannot be empty.");
+            var errorMsgWrapper = "#change-password-error-msg";
+            var errorMsg = "#change-password-error-msg span";
+            if (!currentPassword) {
+                $(errorMsg).text("Typing your current password is required. It cannot be empty.");
                 $(errorMsgWrapper).removeClass("hidden");
             } else if (!newPassword) {
-                $(errorMsg).text("New password is a required field. It cannot be empty.");
+                $(errorMsg).text("Typing your new password is required. It cannot be empty.");
                 $(errorMsgWrapper).removeClass("hidden");
-            } else if (!confirmedPassword) {
-                $(errorMsg).text("Retyping the new password is required.");
+            } else if (!retypedNewPassword) {
+                $(errorMsg).text("Confirming your new password is required. It cannot be empty.");
                 $(errorMsgWrapper).removeClass("hidden");
-            } else if (confirmedPassword != newPassword) {
-                $(errorMsg).text("New password doesn't match the confirmation.");
+            } else if (retypedNewPassword != newPassword) {
+                $(errorMsg).text("Password confirmation failed. Please check.");
                 $(errorMsgWrapper).removeClass("hidden");
-            } else if (!inputIsValid(/^[\S]{5,30}$/, confirmedPassword)) {
-                $(errorMsg).text("Password should be minimum 5 characters long, should not include any whitespaces.");
+            } else if (!inputIsValid(/^[\S]{5,30}$/, newPassword)) {
+                $(errorMsg).text("Password should be minimum 5 characters long and " +
+                    "should not include any whitespaces. Please check.");
                 $(errorMsgWrapper).removeClass("hidden");
             } else {
                 var changePasswordFormData = {};
-                //changePasswordFormData.username = user;
-                changePasswordFormData.newPassword = unescape((confirmedPassword));
-                changePasswordFormData.oldPassword = unescape((oldPassword));
-
+                changePasswordFormData["oldPassword"] = unescape((currentPassword));
+                changePasswordFormData["newPassword"] = unescape((newPassword));
 
                 var changePasswordAPI = "/api/device-mgt/v1.0/users/" + user + "/credentials";
 
@@ -64,7 +81,7 @@ $(document).ready(function () {
                         }
                     }, function (jqXHR) {
                         if (jqXHR.status == 400) {
-                            $(errorMsg).text("Old password does not match with the provided value.");
+                            $(errorMsg).text("Your current password does not match with the provided value.");
                             $(errorMsgWrapper).removeClass("hidden");
                         } else {
                             $(errorMsg).text("An unexpected error occurred. Please try again later.");
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
index c4fd938ae5e..1ff652c8c87 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
@@ -15,73 +15,91 @@
   specific language governing permissions and limitations
   under the License.
 }}
+
 {{#zone "userMenu-items"}}
     <li>
         <a href="javascript:void(0)" id="change-password">Change password</a>
     </li>
     <li>
+        <!--suppress HtmlUnknownTarget -->
         <a href="{{@app.context}}/logout">Sign out</a>
     </li>
 
     <div id="change-password-window" class="hide">
         <input type="hidden" id="user" value="{{username}}">
         <div class="modal-header">
-            <h3 class="pull-left modal-title">
+            <h4 class="pull-left modal-title">
                 <span class="fw-stack">
-                    <i class="fw fw-ring fw-stack-2x"></i>
-                    <i class="fw fw-key fw-stack-1x"></i>
+                    <i class="fw fw-user fw-stack-2x"></i>
+                    <span class="fw-stack fw-move-right fw-move-bottom">
+                      <i class="fw fw-ring fw-stack-2x"></i>
+                      <i class="fw fw-circle fw-stack-2x fw-stroke text-info"></i>
+                      <i class="fw fw-edit fw-stack-1x fw-inverse"></i>
+                   </span>
                 </span>
-                Change Password
-            </h3>
+                &nbsp;&nbsp;Change password
+            </h4>
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
         </div>
+        <hr>
         <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <div id="notification-error-msg" class="alert alert-danger hidden" role="alert">
+            <div id="change-password-error-msg" class="alert alert-danger hidden" role="alert">
                 <i class="icon fw fw-error"></i><span></span>
             </div>
-            <h3>
-                Enter old password *
+            <h5>
+                Type your current password *
                 <br><br>
                 <div>
-                    <input type="password" class="form-control modal-input operationDataKeys" id="old-password" data-key="message"/>
+                    <input id="current-password" type="password" class="form-control modal-input"/>
                 </div>
-                <br>
-                Enter new password *
+                <br><br>
+                Type a new password *
                 <br><br>
                 <div>
-                    <input type="password" class="form-control modal-input operationDataKeys" id="new-password" data-key="message"/>
+                    <input id="new-password" type="password" class="form-control modal-input"
+                           placeholder="[ Password should be in minimum 5 characters long and should not include any whitespaces ]"/>
                 </div>
-                <br>
-                Retype new password *
+                <br><br>
+                Reconfirm your new password *
                 <br><br>
                 <div>
-                    <input type="password" class="form-control modal-input operationDataKeys" id="confirmed-password" data-key="message"/>
+                    <input id="retyped-new-password" type="password" class="form-control modal-input"/>
                 </div>
-                <br>
-            </h3>
+                <br><br>
+            </h5>
         </div>
         <div class="modal-footer">
             <div class="buttons">
-                <a href="#" id="change-password-yes-link" class="btn-operations">Update</a>
+                <a href="#" id="change-password-yes-link" class="btn-operations">Change</a>
                 <a href="#" id="change-password-cancel-link" class="btn-operations">Cancel</a>
             </div>
         </div>
-
     </div>
 
     <div id="change-password-success-content" class="hide">
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h3>Password change is successful.</h3>
-                    <div class="buttons">
-                        <a href="#" id="change-password-success-link" class="btn-operations">Ok</a>
-                    </div>
-                </div>
+        <div class="modal-header">
+            <h4 class="pull-left modal-title">
+                <span class="fw-stack fw-move-right fw-move-bottom">
+                    <i class="fw fw-circle fw-stack-2x fw-stroke text-success"></i>
+                    <i class="fw fw-check fw-stack-1x fw-inverse"></i>
+                </span>
+                &nbsp;&nbsp;Password has been successfully updated
+            </h4>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
+        </div>
+        <hr>
+        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
+            <h5 class="text-center">
+                You can now try to login using your new password.
+            </h5>
+        </div>
+        <div class="modal-footer">
+            <div class="buttons">
+                <a href="#" id="change-password-success-link" class="btn-operations">Ok</a>
             </div>
         </div>
     </div>
 {{/zone}}
 {{#zone "bottomJs"}}
-    <script src="{{@unit.publicUri}}/js/user-menu.js"></script>
+    {{js "/js/user-menu.js"}}
 {{/zone}}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.js
index e0ebe26b0a4..39819deacf7 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.js
@@ -1,3 +1,21 @@
+/*
+ * 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
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 function onRequest() {
     var constants = require("/app/modules/constants.js");
     return session.get(constants["USER_SESSION_KEY"]);
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
index 2c36f248d4a..34b21301edd 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
@@ -105,7 +105,7 @@
          data-offset-top="80">
         <ul class="sidebar-messages">
         </ul>
-        <div class="text-center"><a href="{{appContext}}notification-listing" class="btn btn-primary">Show all notifications</a></div>
+        <div class="text-center"><a href="{{appContext}}notification-listing" class="btn btn-primary">Show All Notifications</a></div>
     </div>
 {{/zone}}
 {{#zone "bottomJs"}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/jquery.qrcode.min.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/jquery.qrcode.min.js
old mode 100755
new mode 100644
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js
index 5f3605da38a..e94a5500a65 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js
@@ -102,23 +102,28 @@ function loadNewNotifications() {
                         if (responsePayload.count > 0) {
                             $(messageSideBar).html(template(viewModel));
                         } else {
-                            $(messageSideBar).html("<h4 class='text-center'>No new notifications found...</h4>");
+                            $(messageSideBar).html(
+                                "<h4 class='text-center'>No New Notifications</h4>" +
+                                "<h5 class='text-center text-muted'>" +
+                                    "Check this section for error notifications<br>related to device operations" +
+                                "</h5>"
+                            );
                         }
                     } else {
-                        $(messageSideBar).html("<h4 class ='message-danger'>Unexpected error occurred while loading new notifications.</h4>");
+                        $(messageSideBar).html("<h4 class ='message-danger text-center'>Unexpected error occurred while loading new notifications</h4>");
                     }
                 }
             };
             var errorCallback = function (jqXHR) {
                 if (jqXHR.status = 500) {
-                    $(messageSideBar).html("<h4 class ='message-danger'>Unexpected error occurred while trying " +
-                        "to retrieve any new notifications.</h4>");
+                    $(messageSideBar).html("<h4 class ='message-danger text-center'>Unexpected error occurred while trying " +
+                        "to retrieve any new notifications</h4>");
                 }
             };
             invokerUtil.get(serviceURL, successCallback, errorCallback);
         });
     } else {
-        $(messageSideBar).html("<h4 class ='message-danger'>You are not authorized to view notifications</h4>");
+        $(messageSideBar).html("<h4 class ='message-danger text-center'>You are not authorized to view notifications</h4>");
     }
 }