diff --git a/addons/nametags/ACE_Settings.hpp b/addons/nametags/ACE_Settings.hpp
index 986b5c187b..3aecd650b4 100644
--- a/addons/nametags/ACE_Settings.hpp
+++ b/addons/nametags/ACE_Settings.hpp
@@ -11,7 +11,7 @@ class ACE_Settings {
         isClientSettable = 1;
         displayName = "$STR_ACE_NameTags_ShowPlayerNames";
         description = "$STR_ACE_NameTags_ShowPlayerNames_Desc";
-        values[] = {"$STR_ACE_Common_Disabled", "$STR_ACE_Common_Enabled", "$STR_ACE_Common_OnlyCursor", "$STR_ACE_Common_OnlyOnKeypress", "$STR_ACE_Common_OnlyCursorAndKeyPress"};
+        values[] = {"$STR_ACE_NameTags_Disabled", "$STR_ACE_NameTags_Enabled", "$STR_ACE_NameTags_OnlyCursor", "$STR_ACE_NameTags_OnlyOnKeypress", "$STR_ACE_NameTags_OnlyCursorAndKeypress"};
     };
     class GVAR(showPlayerRanks) {
         value = 1;
diff --git a/addons/nametags/CfgVehicles.hpp b/addons/nametags/CfgVehicles.hpp
index fabd3b09cb..ad93cc1c27 100644
--- a/addons/nametags/CfgVehicles.hpp
+++ b/addons/nametags/CfgVehicles.hpp
@@ -12,6 +12,35 @@ class CfgVehicles {
         isGlobal = 1;
         icon = QUOTE(PATHTOF(UI\Icon_Module_NameTags_ca.paa));
         class Arguments {
+            class showPlayerNames {
+                displayName = "$STR_ACE_NameTags_ShowPlayerNames";
+                description = "$STR_ACE_NameTags_ShowPlayerNames_Desc";
+                typeName = "SCALAR";
+                defaultValue = 1;
+                class values {
+                    class Disabled {
+                        name = "$STR_ACE_NameTags_Disabled";
+                        value = 0;
+                    };
+                    class Enabled {
+                        default = 1;
+                        name = "$STR_ACE_NameTags_Enabled";
+                        value = 1;
+                    };
+                    class OnlyCursor {
+                        name = "$STR_ACE_NameTags_OnlyCursor";
+                        value = 2;
+                    };
+                    class OnlyOnKeypress {
+                        name = "$STR_ACE_NameTags_OnlyOnKeypress";
+                        value = 3;
+                    };
+                    class OnlyCursorAndKeypress {
+                        name = "$STR_ACE_NameTags_OnlyCursorAndKeypress";
+                        value = 4;
+                    };
+                };
+            };
             class PlayerNamesViewDistance {
                 displayName = "$STR_ACE_NameTags_PlayerNamesViewDistance_DisplayName";
                 description = "$STR_ACE_NameTags_PlayerNamesViewDistance_Description";
diff --git a/addons/nametags/XEH_postInit.sqf b/addons/nametags/XEH_postInit.sqf
index cea2025dcc..1b649ac8a6 100644
--- a/addons/nametags/XEH_postInit.sqf
+++ b/addons/nametags/XEH_postInit.sqf
@@ -1,7 +1,9 @@
 // by commy2 and esteldunedain
 #include "script_component.hpp"
 
-[] call FUNC(initIsSpeaking);
+if (QGVAR(showPlayerNames) > 0) then {
+    [] call FUNC(initIsSpeaking);
+};
 
 if (!hasInterface) exitWith {};
 
@@ -24,4 +26,6 @@ GVAR(ShowNamesTime) = -10;
 
 
 // Draw handle
-addMissionEventHandler ["Draw3D", {_this call FUNC(onDraw3d);}];
+if (QGVAR(showPlayerNames) > 0 || QGVAR(showVehicleCrewInfo)) then {
+    addMissionEventHandler ["Draw3D", {_this call FUNC(onDraw3d);}];
+};
diff --git a/addons/nametags/functions/fnc_moduleNameTags.sqf b/addons/nametags/functions/fnc_moduleNameTags.sqf
index 1bbd4d8efb..0bee0e1a9c 100644
--- a/addons/nametags/functions/fnc_moduleNameTags.sqf
+++ b/addons/nametags/functions/fnc_moduleNameTags.sqf
@@ -20,9 +20,10 @@ if !(_activated) exitWith {};
 
 GVAR(Module) = true;
 
+[_logic, QGVAR(showPlayerNames),          "showPlayerNames"             ] call EFUNC(common,readSettingFromModule);
 [_logic, QGVAR(PlayerNamesViewDistance),  "PlayerNamesViewDistance"     ] call EFUNC(common,readSettingFromModule);
 [_logic, QGVAR(ShowNamesForAI),           "ShowNamesForAI"              ] call EFUNC(common,readSettingFromModule);
 [_logic, QGVAR(showVehicleCrewInfo),      "showVehicleCrewInfo"         ] call EFUNC(common,readSettingFromModule);
-[_logic, QGVAR(showCursorTagForVehicles),  "showCursorTagForVehicles"    ] call EFUNC(common,readSettingFromModule);
+[_logic, QGVAR(showCursorTagForVehicles),  "showCursorTagForVehicles"   ] call EFUNC(common,readSettingFromModule);
 
 diag_log text "[ACE]: NameTags Module Initialized.";
diff --git a/addons/nametags/stringtable.xml b/addons/nametags/stringtable.xml
index ef94140510..74b8372dc6 100644
--- a/addons/nametags/stringtable.xml
+++ b/addons/nametags/stringtable.xml
@@ -161,31 +161,31 @@
             <English></English>
             <Polish>Moduł ten pozwala dostosować ustawienia i zasięg wyświetlania imion.</Polish>
         </Key>
-        <Key ID="STR_ACE_Common_Disabled">
+        <Key ID="STR_ACE_NameTags_Disabled">
             <English>Disabled</English>
             <Polish>Wyłączone</Polish>
         </Key>
-        <Key ID="STR_ACE_Common_Enabled">
+        <Key ID="STR_ACE_NameTags_Enabled">
             <English>Enabled</English>
             <Polish>Włączone</Polish>
         </Key>
-        <Key ID="STR_ACE_Common_OnlyCursor">
+        <Key ID="STR_ACE_NameTags_OnlyCursor">
             <English>Only Cursor</English>
             <Polish>Tylko pod kursorem</Polish>
         </Key>
-        <Key ID="STR_ACE_Common_OnlyOnKeypress">
+        <Key ID="STR_ACE_NameTags_OnlyOnKeypress">
             <English>Only On Keypress</English>
             <Polish>Tylko po wciśnięciu klawisza</Polish>
         </Key>
-        <Key ID="STR_ACE_Common_OnlyCursorAndKeyPress">
-            <English>Only Cursor and KeyPress</English>
+        <Key ID="STR_ACE_NameTags_OnlyCursorAndKeypress">
+            <English>Only Cursor and Keypress</English>
             <Polish>Tylko pod kursorem i po wciśnięciu klawisza</Polish>
         </Key>
-        <Key ID="STR_ACE_Common_NameTagSettings">
+        <Key ID="STR_ACE_NameTags_NameTagSettings">
             <English>Use Nametag settings</English>
             <Polish>Użyj ustawień imion</Polish>
         </Key>
-        <Key ID="STR_ACE_Common_AlwaysShowAll">
+        <Key ID="STR_ACE_NameTags_AlwaysShowAll">
             <English>Always Show All</English>
             <Polish>Zawsze pokazuj wszystkie</Polish>
         </Key>