Added login redirect
Merge branch 'login'