Forgot password

Depends on #14 and #15 being merged first :-)
All of this testing is way better than the previous two PRs :-)