Refactoring user new/edit form