Dfoxpowell/reset password error

addresses

https://github.com/optimizely/marketing-website/issues/496
https://github.com/optimizely/marketing-website/issues/497
https://github.com/optimizely/marketing-website/issues/495