Take the id out of the auth sign in

This should fix #4617 but needs more testing
Fix #6764