Improve faking of logged-in-user