Improve faking of logged-in-user

I like putting this here.