Fixed login error.
Refined fix
Merge branch 'develop'