Login minors fix