Applying fix similar to UserMenu to UserPage