refactor form for users