Ninth login case + (#88)

After some conversation with Brian, we've decided to add another case to the login method.

Now contains all of (#88)