Index: src/ch/ch.cpp
===================================================================
diff -u -N -r8dc649003961dad64b92da67426814fb5dd862e0 -r694e362bf3ce049a7bbba8b4cf442d07e6741901
--- src/ch/ch.cpp	(.../ch.cpp)	(revision 8dc649003961dad64b92da67426814fb5dd862e0)
+++ src/ch/ch.cpp	(.../ch.cpp)	(revision 694e362bf3ce049a7bbba8b4cf442d07e6741901)
@@ -363,6 +363,17 @@
 
 	EnableHtmlHelp();
 
+	// ================================= Handle early command line options ========================================
+	if(m_cmdLineParser.HasCommandLineParams() && m_cmdLineParser.HasSystemStartupOption())
+	{
+		SetPropValue<PP_PRELOADAFTERRESTART>(rCfg, m_cmdLineParser.IsSystemStartupEnabled());
+		rCfg.Write();
+
+		SetAutorun(GetPropValue<PP_PRELOADAFTERRESTART>(rCfg));
+
+		return FALSE;
+	}
+
 	// ================================= Checking for running instances of CH ========================================
 	// check instance - return false if it's the second one
 	LOG_INFO(_T("Checking for other running instances of Copy Handler"));