PasswordManager issue fixed