diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml
index cb40f08fa1..69e652e29b 100644
--- a/addons/common/stringtable.xml
+++ b/addons/common/stringtable.xml
@@ -1503,5 +1503,21 @@
         <Key ID="STR_ACE_Common_TimeLeft">
             <English>Time left: %1s</English>
         </Key>
+        <Key ID="STR_ACE_Common_LocationsBoostTraining_DisplayName">
+            <English>Locations Boost Training</English>
+            <Czech>Zdravotnická místa zvyšují zdravotnickou úrovně</Czech>
+            <Italian>Sedi per potenziare la formazione</Italian>
+            <German>Örtliche Trainingssteigerung</German>
+            <Spanish>Ubicación mejora entrenamiento.</Spanish>
+            <Polish>Miejsca zwiększają wyszkolenie</Polish>
+            <Portuguese>Localização melhora treinamento</Portuguese>
+            <French>Le lieu améliore l'efficacité</French>
+            <Russian>Места ускоренного обучения</Russian>
+            <Japanese>衛生能力の上昇位置</Japanese>
+            <Korean>교육 증가 지역</Korean>
+            <Chinesesimp>受所在位置影响提升医疗能力</Chinesesimp>
+            <Chinese>受所在位置影響提升醫療能力</Chinese>
+            <Turkish>Konumlar Tedaviyi Hızlandırır</Turkish>
+        </Key>
     </Package>
 </Project>
diff --git a/addons/medical_treatment/initSettings.sqf b/addons/medical_treatment/initSettings.sqf
index c101390afe..75c60af3a7 100644
--- a/addons/medical_treatment/initSettings.sqf
+++ b/addons/medical_treatment/initSettings.sqf
@@ -47,7 +47,7 @@
 [
     QGVAR(locationsBoostTraining),
     "CHECKBOX",
-    [LSTRING(LocationsBoostTraining_DisplayName), LSTRING(LocationsBoostTraining_Description)],
+    [ELSTRING(common,LocationsBoostTraining_DisplayName), LSTRING(LocationsBoostTraining_Description)],
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     false,
     true
diff --git a/addons/medical_treatment/stringtable.xml b/addons/medical_treatment/stringtable.xml
index 64b614a79f..e85abf42d3 100644
--- a/addons/medical_treatment/stringtable.xml
+++ b/addons/medical_treatment/stringtable.xml
@@ -162,22 +162,6 @@
         <Key ID="STR_ACE_Medical_Treatment_ClearTrauma_AfterStitch">
             <English>After Stitch</English>
         </Key>
-        <Key ID="STR_ACE_Medical_Treatment_LocationsBoostTraining_DisplayName">
-            <English>Locations Boost Training</English>
-            <Czech>Zdravotnická místa zvyšují zdravotnickou úrovně</Czech>
-            <Italian>Sedi per potenziare la formazione</Italian>
-            <German>Örtliche Trainingssteigerung</German>
-            <Spanish>Ubicación mejora entrenamiento.</Spanish>
-            <Polish>Miejsca zwiększają wyszkolenie</Polish>
-            <Portuguese>Localização melhora treinamento</Portuguese>
-            <French>Le lieu améliore l'efficacité</French>
-            <Russian>Места ускоренного обучения</Russian>
-            <Japanese>衛生能力の上昇位置</Japanese>
-            <Korean>교육 증가 지역</Korean>
-            <Chinesesimp>受所在位置影响提升医疗能力</Chinesesimp>
-            <Chinese>受所在位置影響提升醫療能力</Chinese>
-            <Turkish>Konumlar Tedaviyi Hızlandırır</Turkish>
-        </Key>
         <Key ID="STR_ACE_Medical_Treatment_LocationsBoostTraining_Description">
             <English>Boost medical training when in medical vehicles or facilities. Untrained becomes medic, medic becomes doctor.</English>
             <Japanese>衛生車両か施設では衛生能力を上昇します。未訓練では衛生兵に、衛生兵では医師になります。</Japanese>
diff --git a/addons/repair/functions/fnc_isEngineer.sqf b/addons/repair/functions/fnc_isEngineer.sqf
index 6a80b1012e..061c5addb1 100644
--- a/addons/repair/functions/fnc_isEngineer.sqf
+++ b/addons/repair/functions/fnc_isEngineer.sqf
@@ -25,4 +25,11 @@ private _class = _unit getVariable ["ACE_IsEngineer", _unit getUnitTrait "engine
 if (_class isEqualType false) then {_class = [0, 1] select _class};
 
 TRACE_3("isEngineer",_unit,_engineerN,_class);
-_class >= _engineerN;
+if (_class >= _engineerN) exitWith {true};
+if (!GVAR(locationsBoostTraining)) exitWith {false};
+
+if ([_unit] call FUNC(isInRepairFacility) || {[_unit] call FUNC(isNearRepairVehicle)}) then {
+    _class = _class + 1; // Boost engineer training by one: untrained becomes engineer, engineer becomes advanced engineer
+};
+
+_class >= _engineerN
diff --git a/addons/repair/initSettings.sqf b/addons/repair/initSettings.sqf
index 2e64f01208..5f2f98a763 100644
--- a/addons/repair/initSettings.sqf
+++ b/addons/repair/initSettings.sqf
@@ -52,6 +52,15 @@
     {[QGVAR(consumeItem_toolKit), _this] call EFUNC(common,cbaSettings_settingChanged)}
 ] call CBA_fnc_addSetting;
 
+[
+    QGVAR(locationsBoostTraining),
+    "CHECKBOX",
+    [ELSTRING(common,LocationsBoostTraining_DisplayName), LSTRING(LocationsBoostTraining_Description)],
+    [localize ELSTRING(OptionsMenu,CategoryLogistics), localize "str_state_repair"],
+    false,
+    true
+] call CBA_fnc_addSetting;
+
 [
     QGVAR(fullRepairLocation), "LIST",
     [LSTRING(fullRepairLocation), LSTRING(fullRepairLocation_description)],
diff --git a/addons/repair/stringtable.xml b/addons/repair/stringtable.xml
index c78a2eaa69..3eb9fdc951 100644
--- a/addons/repair/stringtable.xml
+++ b/addons/repair/stringtable.xml
@@ -261,6 +261,9 @@
             <Chinese>維修載具中...</Chinese>
             <Turkish>Tamir Ediliyor...</Turkish>
         </Key>
+        <Key ID="STR_ACE_Repair_LocationsBoostTraining_Description">
+            <English>Boost engineer training when in repair vehicles or facilities. Untrained becomes engineer, engineer becomes advanced engineer.</English>
+        </Key>
         <Key ID="STR_ACE_Repair_fullRepairLocation">
             <English>Full Repair Locations</English>
             <German>Möglichkeit zur vollständigen Reperatur</German>