Fixed login window
Merge branch 'master' of https://github.com/Dalthow/Etaron