diff --git a/conf/control_panel_example.xml b/conf/control_panel_example.xml
index cbbb316097..c850571737 100644
--- a/conf/control_panel_example.xml
+++ b/conf/control_panel_example.xml
@@ -181,6 +181,19 @@
       <program name="Messages"/>
     </session>
 
+    <session name="Messages and Settings">
+      <program name="Data Link">
+        <arg flag="-d" constant="/dev/ttyUSB0"/>
+        <arg flag="-s" constant="57600"/>
+      </program>
+      <program name="Server">
+        <arg flag="-n"/>
+      </program>
+      <program name="Messages"/>
+      <program name="Settings">
+        <arg flag="-ac" constant="@AIRCRAFT"/>
+      </program>
+    </session>
 
   </section>
 
diff --git a/sw/supervision/pc_control_panel.ml b/sw/supervision/pc_control_panel.ml
index 3d867fdb69..701d402025 100644
--- a/sw/supervision/pc_control_panel.ml
+++ b/sw/supervision/pc_control_panel.ml
@@ -244,7 +244,9 @@ let supervision = fun ?file gui log (ac_combo : Gtk_tools.combo) (target_combo :
 	  (fun arg ->
 	    let constant =
 	      try double_quote (Xml.attrib arg "constant") with _ -> "" in
-	    p := sprintf "%s %s %s" !p (ExtXml.attrib arg "flag") constant)
+	    let real_constant =
+	      if constant = "@AIRCRAFT" then (Gtk_tools.combo_value ac_combo) else constant in
+	    p := sprintf "%s %s %s" !p (ExtXml.attrib arg "flag") real_constant)
 	  (Xml.children program);
 	run_and_monitor ?file gui log name !p)
       (Xml.children session)