Removed userprofile check