Tweak to the protected-user logic