             self.id = ""
             self.username = ""
         }
-
-
+        
         do {
-            if let authToken = try keychain.get("authToken") {
-                self.authToken = authToken
+            if let password = try keychain.get("password") {
+                self.password = password
             }
         } catch {
-            NSLog("Failed to set authToken")
+            NSLog("Failed to set password")
+        }
+
+        if (LoginKitConfig.savedLogin == false){
+            do {
+                if let authToken = try keychain.get("authToken") {
+                    self.authToken = authToken
+                }
+            } catch {
+                NSLog("Failed to set authToken")
+            }
         }
     }
 

        didSet {
            if LoginService.storePassword {
                // Store to keychain
                if authToken != nil {
                    do {
                        try keychain.set(authToken!, key: "authToken")
                    } catch {
                        NSLog("Failed to set authToken")
                    }
                } else {
                    self.clearToken()
                }
            }
        }

            try keychain.remove("authToken")
        } catch {
            NSLog("Failed to clear authToken")
        }
    }
    
    func clearPassword() {
        do {
            try keychain.remove("password")
        } catch {
            NSLog("Failed to clear password")
        }
    }

