gracefully handle incorrect form input. fixes #1425 and refs #1413
Merge pull request #1492 from craigh/lostpassword

gracefully handle incorrect form input. fixes #1425 and refs #1413