From eed54aaf9f37ee82a19a75a565c048c71008deb6 Mon Sep 17 00:00:00 2001
From: amalhub <amalg@wso2.com>
Date: Wed, 30 Aug 2017 14:32:21 +0530
Subject: [PATCH] Resolves: https://github.com/wso2/product-iots/issues/1008

---
 .../public/js/user-menu.js                                    | 4 +++-
 .../units/cdmf.unit.ui.header.default.user-menu/user-menu.hbs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.default.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.default.user-menu/public/js/user-menu.js
index ecd93a8bc6..7ef1c320bc 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.default.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.default.user-menu/public/js/user-menu.js
@@ -86,7 +86,9 @@ $(document).ready(function () {
                             $("#change-password-success-link").click(function () {
                                 hidePopup();
                             });
-                            window.location.href = "/devicemgt/logout";
+                            setTimeout(function(){
+                                window.location.href = "/devicemgt/logout";
+                            },10000);
                         }
                     }, function (jqXHR) {
                         if (jqXHR.status == 400) {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.default.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.default.user-menu/user-menu.hbs
index ee2ccdc968..7e0fac5d3e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.default.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.default.user-menu/user-menu.hbs
@@ -104,7 +104,7 @@
                     <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.
+                            You will be logged out automatically, Please login using your new password.
                         </h5>
                     </div>
                     <div class="modal-footer">