Fix for automode option not being correctly applied on auth or resync