Can't you just push the auto assign button again to disable that??