Fixed login logic
Merge pull request #119 from ballauriena/BEN/login

Fixed login logic