diff --git a/Source/build.cpp b/Source/build.cpp
index 6761fb68..f1668358 100644
--- a/Source/build.cpp
+++ b/Source/build.cpp
@@ -470,15 +470,9 @@ int CEXEBuild::preprocess_string(char *out, const char *in)
       while (l--)
       {
         int i = (unsigned char)*p++;
-#ifndef NSIS_SUPPORT_NAMED_USERVARS
         if (i >= VAR_CODES_START) {
           *out++ = (char)255;
         }
-#else
-        if (i == VAR_CODES_START || i == 255 ) {
-          *out++ = (char)255;
-        }
-#endif
         *out++=i;
       }
       continue;
@@ -488,21 +482,10 @@ int CEXEBuild::preprocess_string(char *out, const char *in)
     
     p=np;
     
-#ifndef NSIS_SUPPORT_NAMED_USERVARS
     // Test for characters extending into the variable codes
     if (i >= VAR_CODES_START) {
       *out++ = (char)255;
     }
-#else
-    // Test for characters that equals to control char of variable codes or lang strings
-    if (i == VAR_CODES_START ||
-#ifdef NSIS_SUPPORT_LANG_IN_STRINGS
-        i == LANG_CODES_START ||
-#endif
-        i == 255 ) {
-      *out++ = (char)255;
-    }
-#endif
     else if (i == '$')
     {
       if (*p == '$')
diff --git a/Source/exehead/fileform.h b/Source/exehead/fileform.h
index eb953397..e1af6e13 100644
--- a/Source/exehead/fileform.h
+++ b/Source/exehead/fileform.h
@@ -517,7 +517,7 @@ DWORD NSISCALL SetSelfFilePointer(LONG lDistanceToMove, DWORD dwMoveMethod);
 // $0..$9, $INSTDIR, etc are encoded as ASCII bytes starting from this value.
 // Added by ramon 3 jun 2003
 #ifdef NSIS_SUPPORT_NAMED_USERVARS
-  #define VAR_CODES_START 250
+  #define VAR_CODES_START 253
 #else
 #ifdef NSIS_CONFIG_PLUGIN_SUPPORT
   #define VAR_CODES_START (256 - 37)
@@ -527,7 +527,7 @@ DWORD NSISCALL SetSelfFilePointer(LONG lDistanceToMove, DWORD dwMoveMethod);
 #endif
 
 #ifdef NSIS_SUPPORT_LANG_IN_STRINGS
-  #define LANG_CODES_START 251
+  #define LANG_CODES_START 254
 #endif
 
 union installer_flags {