Fixed login (hopefully fully)