fix login
Merge branch 'working' of https://github.com/romeobk/LTT_FYJ into working