diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 7a135fa53cafec88b4aee0fd2fb95b77cf5a982e..a266156a4736af6b10583e337988f96bad392a41 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -91,7 +91,6 @@ SetOverwrite on							# Overwrite files by default
 AutoCloseWindow true					# After all files install, close window
 
 InstallDir "%%$PROGRAMFILES%%\${INSTNAME}"
-%%REGISTRY%%
 InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" ""
 UninstallText $(UninstallTextMsg)
 DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup)
@@ -137,6 +136,7 @@ FunctionEnd
 ;; entry to the language ID selector below
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 Function .onInit
+%%ENGAGEREGISTRY%%
 Call CheckCPUFlags							# Make sure we have SSE2 support
 Call CheckWindowsVersion					# Don't install On unsupported systems
     Push $0
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 7ea600f24a8f6f8aa4928fc5db5e07269bf45d50..743df609aac8d8ce6c763cd368f9f9e24bdff83b 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -632,10 +632,10 @@ def package_finish(self):
             """
 
         if(self.args['arch'].lower() == 'x86_64'):
-            registry="SetRegView 64"
+            engage_registry="SetRegView 64"
             program_files="$PROGRAMFILES64"
         else:
-            registry="SetRegView 32"
+            engage_registry="SetRegView 32"
             program_files="$PROGRAMFILES32"
 
         tempfile = "secondlife_setup_tmp.nsi"
@@ -647,7 +647,7 @@ def package_finish(self):
                 "%%INST_VARS%%":inst_vars_template % substitution_strings,
                 "%%INSTALL_FILES%%":self.nsi_file_commands(True),
                 "%%$PROGRAMFILES%%":program_files,
-                "%%REGISTRY%%":registry,
+                "%%ENGAGEREGISTRY%%":engage_registry,
                 "%%DELETE_FILES%%":self.nsi_file_commands(False)})
 
         # We use the Unicode version of NSIS, available from