fix redirect of login
Merge branch '1115'