Fixed UserProfile behavior