Small modification, avoiding second get of user profile.