Hotfix/fix redirects

This fixes an issue where authentication wasn't working correctly. I fixed it poorly by forcing a login, resulting in an endless redirect loop. Authentication wasn't retaining the user login and was testing the customer before testing the user.

This fixes both issues.

And it looks like I have an extra commit in there, which I think you can reject. I'll see if I can get it out of there. Sigh, nope. Sorry