refactoring new account form, as well