Actually fixing the login/authorization issue, I just don't like the fix