HR-194 - bug fixes
HR-195 - refactored, added validation to change email form
Merge pull request #24 from eugene-sea/7.1.4

HR-194 - bug fixes