Fix login redirects (#4025)

Fixes #4022 

Pretty sure the only issue with the
redirects was the `next` variable was never updated to the
`redirect_url` variable. Tested locally it works fine between the
passwordless/passworded logins but couldn't test with social login.
Everything I've seen online indicates this should work fine, though.