Refactored PasswordType