fix login.
Merge branch 'fix/bugs' into develop