Fixes in the login flow
Merge branch 'login-rebase' of github.com:scrollback/scrollback into login-rebase