Keenan's addition of login capability