Updated login check
Merge pull request #257 from Lerogero/master

Updated login check