fixes bug where login was not working
Merge branch 'master' into welcome