Refactoring of UserPasswords