remove email field from ResetForm and refactor form models