diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 7f3b1e511..b1e798307 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -105,7 +105,6 @@ page Custom ExtraOptions
 
 !include "nsisInclude\binariesComponents.nsh"
 
-
 InstType "Minimalist"
 
 
@@ -187,9 +186,8 @@ FunctionEnd
 
 
 Section -"Notepad++" mainSection
-
-	Call setPathAndOptions
-	
+    Call setPathAndOptions
+    
 	${If} $diffArchDir2Remove != ""
 		!insertmacro uninstallRegKey
 		!insertmacro uninstallDir $diffArchDir2Remove 
diff --git a/PowerEditor/installer/nsisInclude/binariesComponents.nsh b/PowerEditor/installer/nsisInclude/binariesComponents.nsh
index 555222014..3fff02cd7 100644
--- a/PowerEditor/installer/nsisInclude/binariesComponents.nsh
+++ b/PowerEditor/installer/nsisInclude/binariesComponents.nsh
@@ -25,6 +25,7 @@
 ; along with this program; if not, write to the Free Software
 ; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+
 SectionGroup "Plugins" Plugins
 	SetOverwrite on
 !ifndef ARCH64
@@ -57,6 +58,8 @@ SectionGroup "Plugins" Plugins
 	${MementoSectionEnd}
 
 	${MementoSection} "Decent Spell-Checking" DSpellCheck
+        Call setPathAndOptions
+        
 		Delete "$INSTDIR\plugins\DSpellCheck.dll"
 		SetOutPath "$INSTDIR\plugins"
 !ifdef ARCH64
@@ -70,6 +73,9 @@ SectionGroup "Plugins" Plugins
 		File "..\bin\plugins\Config\Hunspell\en_US.aff"
 		File "..\bin\plugins\Config\Hunspell\en_US.dic"
 !endif
+        SetOverwrite off
+        SetOutPath "$UPDATE_PATH\plugins\Config"
+        File "..\bin\plugins\Config\DSpellCheckDefaultDisabled\DSpellCheck.ini"
 	${MementoSectionEnd}
 
 SectionGroupEnd
diff --git a/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh b/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
index a46662f0e..b0c969b80 100644
--- a/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
+++ b/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
@@ -27,6 +27,14 @@
 
 Var UPDATE_PATH
 Function setPathAndOptions
+    ${If} $UPDATE_PATH == ""
+        Goto initUpdatePath
+	${ELSE}
+        Goto alreadyDone
+	${EndIf}
+    
+initUpdatePath:
+    
 	; Set Section properties
 	SetOverwrite on
 	StrCpy $UPDATE_PATH $INSTDIR
@@ -48,6 +56,8 @@ Function setPathAndOptions
 		IfFileExists $INSTDIR\allowAppDataPlugins.xml 0 +2
 		Delete $INSTDIR\allowAppDataPlugins.xml
 	${EndIf}
+    
+alreadyDone:
 FunctionEnd
 	
 Function copyCommonFiles
diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat
index cca73b033..6c1251493 100644
--- a/PowerEditor/installer/packageAll.bat
+++ b/PowerEditor/installer/packageAll.bat
@@ -195,6 +195,8 @@ copy /Y "..\bin\plugins\DSpellCheck.dll" .\zipped.package.release\plugins\
 If ErrorLevel 1 goto End
 mkdir .\zipped.package.release\plugins\Config\Hunspell
 If ErrorLevel 1 goto End
+copy /Y "..\bin\plugins\Config\DSpellCheckDefaultDisabled\DSpellCheck.ini" .\zipped.package.release\plugins\Config\
+If ErrorLevel 1 goto End
 copy /Y "..\bin\plugins\Config\Hunspell\en_US.aff" .\zipped.package.release\plugins\Config\Hunspell\
 If ErrorLevel 1 goto End
 copy /Y "..\bin\plugins\Config\Hunspell\en_US.dic" .\zipped.package.release\plugins\Config\Hunspell\
@@ -208,6 +210,8 @@ copy /Y "..\bin64\plugins\DSpellCheck.dll" .\zipped.package.release64\plugins\
 If ErrorLevel 1 goto End
 mkdir .\zipped.package.release64\plugins\Config\Hunspell
 If ErrorLevel 1 goto End
+copy /Y "..\bin\plugins\Config\DSpellCheckDefaultDisabled\DSpellCheck.ini" .\zipped.package.release64\plugins\Config\
+If ErrorLevel 1 goto End
 copy /Y "..\bin64\plugins\Config\Hunspell\en_US.aff" .\zipped.package.release64\plugins\Config\Hunspell\
 If ErrorLevel 1 goto End
 copy /Y "..\bin64\plugins\Config\Hunspell\en_US.dic" .\zipped.package.release64\plugins\Config\Hunspell\