Redirect back to original url on auth
Merge branch 'proper-redirect'