Connect-on-Startup fix