Updated login for non-bastch machines.