Fix inability to reset your password.
Merge branch 'master' of https://github.com/ghindle/connectedmedia