Merge "Ensure a user's SP does't change."