diff --git a/installer/installer/AMXInstaller.exe b/installer/installer/AMXInstaller.exe
index 229474b6..4780667f 100755
Binary files a/installer/installer/AMXInstaller.exe and b/installer/installer/AMXInstaller.exe differ
diff --git a/installer/installer/UnitFunctions.pas b/installer/installer/UnitFunctions.pas
index 0acf618d..ef912072 100755
--- a/installer/installer/UnitFunctions.pas
+++ b/installer/installer/UnitFunctions.pas
@@ -66,7 +66,7 @@ begin
   try
     eRegistry.RootKey := HKEY_CURRENT_USER;
     if eRegistry.OpenKey('Software\Valve\Steam', False) then
-      Result := IncludeTrailingBackslash(StringReplace(eRegistry.ReadString('SteamPath'), '/', '\', [rfReplaceAll])) + 'SteamApps\'
+      Result := IncludeTrailingPathDelimiter(StringReplace(eRegistry.ReadString('SteamPath'), '/', '\', [rfReplaceAll])) + 'SteamApps\'
     else
       Result := '';
   except
diff --git a/installer/installer/UnitInstall.pas b/installer/installer/UnitInstall.pas
index 625beee0..76ab1fbe 100755
--- a/installer/installer/UnitInstall.pas
+++ b/installer/installer/UnitInstall.pas
@@ -486,7 +486,7 @@ begin
         end;
         modESF: begin
           if Pos('esf', FileList[i]) = 1 then begin
-            AddStatus('Copying file: addons\amxmodx\' + Copy(FileList[i], 4, Length(FileList[i])), clBlack);
+            AddStatus('Copying file: addons\amxmodx\' + Copy(FileList[i], 5, Length(FileList[i])), clBlack);
             FileCopy(ExtractFilePath(ParamStr(0)) + 'files\' + FileList[i], ePath + 'addons\amxmodx\' + Copy(FileList[i], 4, Length(FileList[i])), CopyConfig);
           end;
         end;
@@ -596,6 +596,8 @@ var eStr: TStringList;
     CopyConfig: Boolean;
     eGoBack: Boolean;
 begin
+  eGoBack := False;
+
   Screen.Cursor := crAppStart;
   frmMain.cmdCancel.Show;
   frmMain.cmdCancel.Caption := '&Cancel';
diff --git a/installer/installer/UnitSelectModPath.dfm b/installer/installer/UnitSelectModPath.dfm
index e5b31407..b4c3608d 100755
Binary files a/installer/installer/UnitSelectModPath.dfm and b/installer/installer/UnitSelectModPath.dfm differ