Agree that would be super simple and also mimick the current legacy sign-in process.