use querystring to pass in error when missing email
Merge remote-tracking branch 'origin/master'