diff --git a/ui/src/app/pages/nav/nav.component.ts b/ui/src/app/pages/nav/nav.component.ts
index abe0934e2..e863abec2 100644
--- a/ui/src/app/pages/nav/nav.component.ts
+++ b/ui/src/app/pages/nav/nav.component.ts
@@ -23,7 +23,7 @@ export class NavComponent implements OnInit {
   "readSddcSoftwareConfigByID","readSddcSoftwareConfigByVRO","readSddcSoftwareConfigByVC","readSddcSoftwareConfigByUserAndPage","readVROsSddcSoftwareConfigByUser","readSddcSoftwareConfigByTypeAndUser"];
   servermapping:string []= ["updateServerMapping","readMappingsByVROIDAndPage","readMappingsByVCIDAndPage","readSddcSoftwareConfigByTypeAndUser"];
   facility:string[] = ["createFacilitySoftwareConfig","readFacilityByType","readFacilityByPage"];
-  
+
   setting:string[] = ["createSensorSetting","readSensorSettingsByPage","updateSensorSetting","deleteSensorSetting","startFullMappingAggregation","generateServerPDUMapping","readUnMappedServers"];
   sensorsetting:string[] = ["createSensorSetting","readSensorSettingsByPage","updateSensorSetting","deleteSensorSetting"];
   systemSetting:string[] = ["startFullMappingAggregation","generateServerPDUMapping","readUnMappedServers"];
@@ -31,13 +31,13 @@ export class NavComponent implements OnInit {
   adaptermanagement:string [] = ["createFacilityAdapter","updateFacilityAdapter","readAnFacilityAdapterById","deleteAnFacilityAdapterById","readFacilityAdaptersByPage"];
   constructor(private activedRoute:ActivatedRoute,private router: Router,private auth:AuthenticationService) { }
   logout(){
+    localStorage.clear()
     this.auth.logout();
-    
   }
   userprofile(){
     this.router.navigate(["/ui/nav/user/user-profile"]);
   }
-  
+
   ngOnInit() {
       this.username = this.auth.getUsername();
   }
diff --git a/ui/src/app/pages/user-login/user-login.component.html b/ui/src/app/pages/user-login/user-login.component.html
index 86f49f5e1..f4622b5af 100644
--- a/ui/src/app/pages/user-login/user-login.component.html
+++ b/ui/src/app/pages/user-login/user-login.component.html
@@ -18,7 +18,7 @@ <h3 class="welcome">Welcome to</h3>
             </clr-password-container>
             <clr-checkbox-wrapper>
                 <label>Remember me</label>
-                <input type="checkbox" name="rememberMe" clrCheckbox />
+                <input type="checkbox" name="rememberMe" clrCheckbox [(ngModel)]="user.rememberMe"/>
             </clr-checkbox-wrapper>
             <div *ngIf="tips" class="error active" >
                 {{textContent}}
diff --git a/ui/src/app/pages/user-login/user-login.component.ts b/ui/src/app/pages/user-login/user-login.component.ts
index ccdf8bac3..b71740f44 100644
--- a/ui/src/app/pages/user-login/user-login.component.ts
+++ b/ui/src/app/pages/user-login/user-login.component.ts
@@ -19,21 +19,24 @@ export class UserLoginComponent implements OnInit {
     tips:boolean = false;
     textContent = "";
     user ={
-    id:"",
-    username:"",
-    password:"",
+        id:"",
+        username:"",
+        password:"",
+        rememberMe:false
     }
     constructor(private router: Router,private data:AuthenticationService,private ls:LocalStorage) {
     }
     userName:string
-    password:string 
+    password:string
+    rememberMe:boolean
     toLogin(){
         this.userName = this.user.username;
         this.password = this.user.password;
+        this.rememberMe = this.user.rememberMe;
+
         if(this.userName == ""){
             this.tips = true;
             this.textContent = "please input a userName";
-            
         }else if(this.password == ""){
             this.tips = true;
             this.textContent = "please input a password";
@@ -41,7 +44,7 @@ export class UserLoginComponent implements OnInit {
             this.login(this.userName,this.password);
         }
     }
-  
+
     login(userName,password){
         let userInfoBase64:string = "";
         let user:string = "";
@@ -55,6 +58,10 @@ export class UserLoginComponent implements OnInit {
                         privilegeName = priData;
                         let currentUser = btoa(JSON.stringify({username: JSON.parse(user).sub, token: res['access_token'], authorities:privilegeName,expires_in:res['expires_in']}));
                         sessionStorage.setItem('currentUser', currentUser);
+                        if (this.rememberMe) {
+                            localStorage.setItem("username", btoa(userName));
+                            localStorage.setItem("password", btoa(password));
+                        }
                         this.tips = false;
                         this.router.navigate(["ui/nav"]);
                     }
@@ -67,11 +74,16 @@ export class UserLoginComponent implements OnInit {
                 this.tips = true;
                 this.textContent = "Internal error";
             }
-            
-        })      
+        })
+    }
+
+    ngOnInit() {
+        let username = localStorage.getItem("username");
+        let password = localStorage.getItem("password");
+        if (username == null || password == null) {
+            return
+        }
+        this.login(atob(username), atob(password));
     }
-  ngOnInit() {
-    
-  }
 
 }