refactor user forms -- edit