Refactor forms for New User and Edit pages