Fixed login (mostly)