Change auto connect logic