Updated login to not expect qstat
Merged differing workarounds for qstat on login