Reset Password with better error handling and validation, Email from moved to environment settings
Merge pull request #665 from neetumorwani/master

Reset Password with better error handling and validation