#26561 done. Fixed SSO with creation