Simplify login
Merge branch 'login-after' into next