fix login & seat bug
Merge branch 'hotfix' into sal