diff --git a/defaults.xml b/defaults.xml
index 917490d40..2295e522d 100644
--- a/defaults.xml
+++ b/defaults.xml
@@ -785,15 +785,16 @@ Started September 2000 by David Megginson, david@megginson.com
       </buffer>
       <tape-directory type="string" userarchive="y"/>
       <recovery-period type="int" userarchive="y">0</recovery-period>
+      <record-signals type="bool" userarchive="y">true</record-signals>
       <record-multiplayer type="bool" userarchive="y"/>
       <record-main-window type="bool" userarchive="y">false</record-main-window>
       <record-main-view type="bool" userarchive="y">false</record-main-view>
       <replay-main-window-position type="bool" userarchive="y">false</replay-main-window-position>
       <replay-main-window-size type="bool" userarchive="y">false</replay-main-window-size>
       <replay-main-view type="bool" userarchive="y">false</replay-main-view>
-      <record-properties type="bool" userarchive="y">true</record-properties>
-      <record-properties-paths>
-      </record-properties-paths>
+      <record-extra-properties type="bool" userarchive="y">true</record-extra-properties>
+      <record-extra-properties-paths>
+      </record-extra-properties-paths>
     </replay>
     <airport>
       <runways>
diff --git a/gui/dialogs/flight-recorder.xml b/gui/dialogs/flight-recorder.xml
index 5d00fb372..8c5262614 100644
--- a/gui/dialogs/flight-recorder.xml
+++ b/gui/dialogs/flight-recorder.xml
@@ -67,7 +67,7 @@
         <checkbox>
             <row>2</row>
             <col>0</col>
-            <property>sim/replay/record-multiplayer</property>
+            <property>sim/replay/record-signals</property>
             <binding>
                 <command>dialog-apply</command>
             </binding>
@@ -75,27 +75,42 @@
         <text>
             <row>2</row>
             <col>1</col>
-            <label>Include multiplayer aircraft in recordings</label>
+            <label>Include user aircraft in Continuous recordings</label>
             <halign>left</halign>
         </text>
     
         <checkbox>
             <row>3</row>
             <col>0</col>
+            <property>sim/replay/record-multiplayer</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+        </checkbox>
+        <text>
+            <row>3</row>
+            <col>1</col>
+            <label>Include multiplayer aircraft in recordings</label>
+            <halign>left</halign>
+        </text>
+    
+        <checkbox>
+            <row>4</row>
+            <col>0</col>
             <property>sim/replay/record-main-window</property>
             <binding>
                 <command>dialog-apply</command>
             </binding>
         </checkbox>
         <text>
-            <row>3</row>
+            <row>4</row>
             <col>1</col>
             <label>Record main window position and size</label>
             <halign>left</halign>
         </text>
     
         <checkbox>
-            <row>4</row>
+            <row>5</row>
             <col>0</col>
             <property>sim/replay/record-main-view</property>
             <binding>
@@ -103,14 +118,14 @@
             </binding>
         </checkbox>
         <text>
-            <row>4</row>
+            <row>5</row>
             <col>1</col>
             <label>Record main window view</label>
             <halign>left</halign>
         </text>
     
         <checkbox>
-            <row>5</row>
+            <row>6</row>
             <col>0</col>
             <property>sim/replay/replay-main-window-position</property>
             <binding>
@@ -118,14 +133,14 @@
             </binding>
         </checkbox>
         <text>
-            <row>5</row>
+            <row>6</row>
             <col>1</col>
             <label>Replay main window position</label>
             <halign>left</halign>
         </text>
     
         <checkbox>
-            <row>6</row>
+            <row>7</row>
             <col>0</col>
             <property>sim/replay/replay-main-window-size</property>
             <binding>
@@ -133,14 +148,14 @@
             </binding>
         </checkbox>
         <text>
-            <row>6</row>
+            <row>7</row>
             <col>1</col>
             <label>Replay main window size</label>
             <halign>left</halign>
         </text>
     
         <checkbox>
-            <row>7</row>
+            <row>8</row>
             <col>0</col>
             <property>sim/replay/replay-main-view</property>
             <binding>
@@ -148,7 +163,7 @@
             </binding>
         </checkbox>
         <text>
-            <row>7</row>
+            <row>8</row>
             <col>1</col>
             <label>Replay main window view</label>
             <halign>left</halign>