Fixes to ext logins. Disabled for non release.