Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/login/login.controller.js
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/login/login.controller.js	(revision 2539)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/login/login.controller.js	(working copy)
@@ -145,8 +145,9 @@
                                         // }
                                     }
                                 });
-
-                                userMgmtService.getUserRoleInfo(loginData.username).then(function(res) {
+                                let user_info = localStorageService.getWebStorage("user_info");
+                                let current_user = user_info.current_user;
+                                userMgmtService.getUserRoleInfo(current_user).then(function(res) {
                                     if (res && res.status === 200) {
                                         if (res.data.length > 0) {
                                             $rootScope.role_info = res.data[1]['result'];
@@ -160,14 +161,20 @@
                                     var default_lang = CMSettings.language[0].name;
                                     var language = window.localStorage.lang || default_lang;
                                     if (res && res.status === 200) {
-                                        if (language != res.data['language']) {
+                                        if (language !== res.data['language']) {
                                             cmService.post_composer_language(language).then(function(res) {});
                                         }
                                     }
                                 });
+                                let previous_page = localStorageService.getWebStorage("previous_page");
+                                if (previous_page && previous_page.url) {
+                                    $state.go(previous_page.state, previous_page.params);
+                                } else {
+                                    $state.go('index.dashboard');
+                                }
 
                             } else if (error_code === -1) {
-                                if(msg == ""){
+                                if(msg === ""){
                                     $state.go('enable', {enable_passwd: true}, {reload:true});
                                 } else {
                                     loginViewModel.enable_passwd_error = true;
@@ -195,3 +202,4 @@
             }
         }
     ]);
+