 
     /// Data that's saved in the keychain.
     var data: [String: AnyObject] {
-        return [KeychainDataKey.Password.rawValue: password, KeychainDataKey.ServerAddress.rawValue: serverAddress]
+        return [KeychainDataKey.Password.rawValue: password]
     }
 }
 

        self.username = username
        self.password = password
    }
}

//MARK: GenericPasswordSecureStorable


    //MARK: Enumerations

    private enum UserDefaultsKey: String, PrefixedStringConstant {
        case ServerAddress
        case Username
    }

    private enum KeychainDataKey: String {
        case Password = "password"
    }

    //MARK: Static Properties
