Removed original_user helper