More login fixes