login fix
Merge branch 'hotfix/loginfix'