diff --git a/PowerEditor/installer/nsisInclude/binariesComponents.nsh b/PowerEditor/installer/nsisInclude/binariesComponents.nsh
index 722aeec4..af160ec1 100644
--- a/PowerEditor/installer/nsisInclude/binariesComponents.nsh
+++ b/PowerEditor/installer/nsisInclude/binariesComponents.nsh
@@ -195,6 +195,6 @@ ${EndIf}
 FunctionEnd
 
 Section un.PluginsAdmin
-	Delete "$PLUGIN_CONF_PATH\nppPluginList.dll" ; delete 7.6 version's left
+	Delete "$USER_PLUGIN_CONF_PATH\nppPluginList.dll" ; delete 7.6 version's left
 	Delete "$ALLUSERS_PLUGIN_CONF_PATH\nppPluginList.dll"
 SectionEnd
diff --git a/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh b/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
index ea3dce6c..ae8052c2 100644
--- a/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
+++ b/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
@@ -60,10 +60,11 @@ initUpdatePath:
 		Delete $INSTDIR\doLocalConf.xml
 		
 		; "%PROGRAMDATA%\Notepad++\plugins"
-		ReadEnvStr $0 "ALLUSERSPROFILE"
-		StrCpy $PLUGIN_INST_PATH "$0\Notepad++\plugins"
-		StrCpy $ALLUSERS_PLUGIN_CONF_PATH "$0\Notepad++\plugins\Config"
+		SetShellVarContext all
+		StrCpy $PLUGIN_INST_PATH "$APPDATA\${APPNAME}\plugins"
+		StrCpy $ALLUSERS_PLUGIN_CONF_PATH "$APPDATA\${APPNAME}\plugins\Config"
 		
+		SetShellVarContext current
 		StrCpy $USER_PLUGIN_CONF_PATH "$APPDATA\${APPNAME}\plugins\Config"
 		StrCpy $UPDATE_PATH "$APPDATA\${APPNAME}"
 		CreateDirectory $UPDATE_PATH\plugins\config