diff --git a/Windows/MassiveKnob.Plugin.VoiceMeeter/MassiveKnob.Plugin.VoiceMeeter.csproj b/Windows/MassiveKnob.Plugin.VoiceMeeter/MassiveKnob.Plugin.VoiceMeeter.csproj
index 76aaf7d..d155968 100644
--- a/Windows/MassiveKnob.Plugin.VoiceMeeter/MassiveKnob.Plugin.VoiceMeeter.csproj
+++ b/Windows/MassiveKnob.Plugin.VoiceMeeter/MassiveKnob.Plugin.VoiceMeeter.csproj
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>$(localappdata)\MassiveKnob\Plugins\VoiceMeeter\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/Windows/MassiveKnob/Program.cs b/Windows/MassiveKnob/Program.cs
index e3d0a56..d6d9064 100644
--- a/Windows/MassiveKnob/Program.cs
+++ b/Windows/MassiveKnob/Program.cs
@@ -11,6 +11,7 @@ using SimpleInjector;
 
 namespace MassiveKnob
 {
+    // TODO (should have) global exception handler - AppDomain.CurrentDomain.UnhandledException
     public static class Program
     {
         [STAThread]
diff --git a/Windows/Setup/MassiveKnobSetup.iss b/Windows/Setup/MassiveKnobSetup.iss
index 32f6fca..ded0de0 100644
--- a/Windows/Setup/MassiveKnobSetup.iss
+++ b/Windows/Setup/MassiveKnobSetup.iss
@@ -41,6 +41,7 @@ Name: optionalplugins\voicemeeter; Description: "VoiceMeeter actions"; Types: fu
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: "runatstartup"; Description: "{cm:AutoStartProgram,{#AppName}}"; GroupDescription: "{cm:AutoStartProgramGroupDescription}"; Flags: unchecked
 
 [Files]
 ; Main application
@@ -73,8 +74,11 @@ Name: "{localappdata}\MassiveKnob\Plugins"
 Name: "{commonprograms}\{#AppName}"; Filename: "{app}\{#AppExeName}"
 Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Tasks: desktopicon
 
+[Registry]
+Root: HKCU; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "MassiveKnob"; ValueData: "{app}\{#AppExeName}.exe"; Tasks: runatstartup;
+
 [Run]
-;Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(AppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#AppName}}"; Flags: nowait postinstall skipifsilent
 
 [Code]
 // .NET version detection credit goes to: