Tweak to login wait behavior