Fix login
Merge branch 'hotfix/1.2.9.2'