HR-195 - refactored, added validation to change email form