More login related fixes.