Adding support for logins