RegistrationForm refactoring