Fix login method to actually be backwards compatible. Fixes #15