fixes for login-flow