Disable name edit for SSO

This include so upstream commits too.