Fix bugs
Merge branch 'master' of https://github.com/ggoral/improved_login
Merge pull request #69 from jsivori/master

Fix bug