diff --git a/addons/common/functions/fnc_setSetting.sqf b/addons/common/functions/fnc_setSetting.sqf
index 8effc3680d..d50e09fb15 100644
--- a/addons/common/functions/fnc_setSetting.sqf
+++ b/addons/common/functions/fnc_setSetting.sqf
@@ -41,11 +41,11 @@ if ((typeName _value) != (_settingData select 1)) then {
     _failed = true;
     if ((_settingData select 1) == "BOOL" and (typeName _value) == "SCALAR") then {
         // If value is not 0 or 1 consider it invalid and don't set anything
-        if (_value == 0) then {
+        if (_value isEqualTo 0) then {
             _value = false;
             _failed = false;
         };
-        if (_value == 1) then {
+        if (_value isEqualTo 1) then {
             _value = true;
             _failed = false;
         };
diff --git a/addons/nametags/ACE_Settings.hpp b/addons/nametags/ACE_Settings.hpp
index 3e20505614..e976c4adc8 100644
--- a/addons/nametags/ACE_Settings.hpp
+++ b/addons/nametags/ACE_Settings.hpp
@@ -21,17 +21,15 @@ class ACE_Settings {
     };
     class GVAR(showVehicleCrewInfo) {
         value = 1;
-        typeName = "SCALAR";
+        typeName = "BOOL";
         isClientSettable = 1;
         displayName = CSTRING(ShowVehicleCrewInfo);
-        values[] = {CSTRING(DoNotForce), CSTRING(ForceHide), CSTRING(ForceShow)};
     };
     class GVAR(showNamesForAI) {
         value = 0;
-        typeName = "SCALAR";
+        typeName = "BOOL";
         isClientSettable = 1;
         displayName = CSTRING(ShowNamesForAI);
-        values[] = {CSTRING(DoNotForce), CSTRING(ForceHide), CSTRING(ForceShow)};
     };
     class GVAR(showCursorTagForVehicles) {
         value = 0;
diff --git a/addons/nametags/functions/fnc_moduleNameTags.sqf b/addons/nametags/functions/fnc_moduleNameTags.sqf
index 7373d85de1..7a6d2fa3c8 100644
--- a/addons/nametags/functions/fnc_moduleNameTags.sqf
+++ b/addons/nametags/functions/fnc_moduleNameTags.sqf
@@ -21,13 +21,17 @@ if !(_activated) exitWith {};
 GVAR(Module) = true;
 
 [_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);
 
 // Do Not Force - read module setting only non-default is set due to using SCALAR
 if ((_logic getVariable "showPlayerNames") != -1) then {
     [_logic, QGVAR(showPlayerNames),      "showPlayerNames"             ] call EFUNC(common,readSettingFromModule);
 };
+if ((_logic getVariable "showNamesForAI") != -1) then {
+    [_logic, QGVAR(showNamesForAI),      "showNamesForAI"             ] call EFUNC(common,readSettingFromModule);
+};
+if ((_logic getVariable "showVehicleCrewInfo") != -1) then {
+    [_logic, QGVAR(showVehicleCrewInfo),  "showVehicleCrewInfo"         ] call EFUNC(common,readSettingFromModule);
+};
 
 diag_log text "[ACE]: NameTags Module Initialized.";