Be slightly more intelligent about attaching on login.