Login minor fixes