undo commit 7731070aa940ab47c9319c9c35d1b2528d6d4b83: don't use username for login; continue using email