diff --git a/addons/map/XEH_postInitClient.sqf b/addons/map/XEH_postInitClient.sqf
index c06993bded..8c46744088 100644
--- a/addons/map/XEH_postInitClient.sqf
+++ b/addons/map/XEH_postInitClient.sqf
@@ -18,6 +18,9 @@ call FUNC(determineZoom);
     ((findDisplay 12) displayCtrl 51) ctrlAddEventHandler ["Draw", {[] call FUNC(updateMapEffects);}];
 };
 
+// Client only from here
+if !(hasInterface) exitWith {};
+
 ["SettingsInitialized", {
     // Start Blue Force Tracking if Enabled
     if (GVAR(BFT_Enabled)) then {
diff --git a/addons/map/functions/fnc_moduleMap.sqf b/addons/map/functions/fnc_moduleMap.sqf
index 523b58131b..514d2af034 100644
--- a/addons/map/functions/fnc_moduleMap.sqf
+++ b/addons/map/functions/fnc_moduleMap.sqf
@@ -10,7 +10,7 @@
  */
 #include "script_component.hpp"
 
-if !(hasInterface) exitWith {};
+if !(isServer) exitWith {};
 
 PARAMS_3(_logic,_units,_activated);
 
diff --git a/addons/map/stringtable.xml b/addons/map/stringtable.xml
index 255ef400fe..930baf7835 100644
--- a/addons/map/stringtable.xml
+++ b/addons/map/stringtable.xml
@@ -78,7 +78,7 @@
             <Czech>Blue Force Tracking</Czech>
         </Key>
         <Key ID="STR_ACE_Map_BFT_Enabled_DisplayName">
-            <English>Enable</English>
+            <English>BFT Enable</English>
         </Key>
         <Key ID="STR_ACE_Map_BFT_Enabled_Description">
             <English>Enable Blue Force Tracking. Default: No</English>