diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index 9dfa19690..6125dcf82 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -822,6 +822,14 @@ enum Protocol {
   PROTO_LAST
 };
 
+enum TrainerProtocol {
+  MASTER_JACK,
+  SLAVE_JACK,
+  MASTER_SBUS_MODULE,
+  MASTER_CPPM_MODULE,
+  MASTER_SBUS_BATT_COMPARTMENT
+};
+
 class ModuleData {
   public:
     ModuleData() { clear(); }
diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index 6fe0e9873..82b910b7f 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -252,7 +252,19 @@ void ModulePanel::update()
         break;
     }
   }
-  else if (!IS_TARANIS(firmware->getBoard()) || model->trainerMode != 0) {
+  else if (IS_TARANIS(firmware->getBoard())) {
+    switch(model->trainerMode) {
+      case MASTER_JACK:
+        break;
+      case SLAVE_JACK:
+        mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT;
+        break;
+      default:
+        mask |= MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT;
+        break;
+    }
+  }
+  else if (model->trainerMode != MASTER_JACK) {
     mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT;
   }