Fixed login
Merge branch 'master' of https://github.com/CaptainFalcon92/Shuttle