Login Mended.

and some other places…