diff --git a/build/win32/code.iss b/build/win32/code.iss
index 2045e46896183eebca02d69b148a625f9714692b..22c0096e0c573553eb3202faf636e766ee4a786e 100644
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@@ -1027,7 +1027,7 @@ begin
       Sleep(1000);
     end;
 
-    Exec(ExpandConstant('{app}\inno_updater.exe'), ExpandConstant('_ "{app}\unins000.dat" ' + BoolToStr(LockFileExists())), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode);
+    Exec(ExpandConstant('{app}\inno_updater.exe'), ExpandConstant('"{app}\{#ExeBasename}.exe" ' + BoolToStr(LockFileExists())), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode);
   end;
 end;
 
diff --git a/build/win32/inno_updater.exe b/build/win32/inno_updater.exe
index 2d5d1ab1d493d93ee67d18fe0b7c1665c3f3dec2..ffc04fb766193a705b63fd8ba6416b693e2d31ee 100644
Binary files a/build/win32/inno_updater.exe and b/build/win32/inno_updater.exe differ
diff --git a/src/vs/workbench/parts/update/electron-browser/update.contribution.ts b/src/vs/workbench/parts/update/electron-browser/update.contribution.ts
index b533e60a755cb6c6587fcf695fe68c95fa9454fa..6b6cc303dd52ef54989167026d2f1276661c30e8 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.contribution.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.contribution.ts
@@ -7,6 +7,7 @@
 
 import * as nls from 'vs/nls';
 import 'vs/css!./media/update.contribution';
+import product from 'vs/platform/node/product';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { ReleaseNotesEditor } from 'vs/workbench/parts/update/electron-browser/releaseNotesEditor';
@@ -60,7 +61,7 @@ configurationRegistry.registerConfiguration({
 		},
 		'update.enableWindowsBackgroundUpdates': {
 			'type': 'boolean',
-			'default': false,
+			'default': product.quality === 'insider',
 			'description': nls.localize('enableWindowsBackgroundUpdates', "Enables Windows background updates.")
 		}
 	}