diff --git a/gui/dialogs/atc-ai.xml b/gui/dialogs/atc-ai.xml
index 5f8f352c0..a501abbb9 100644
--- a/gui/dialogs/atc-ai.xml
+++ b/gui/dialogs/atc-ai.xml
@@ -31,26 +31,9 @@
 			<checkbox>
 				<halign>left</halign>
 				<label>Enable AI traffic</label>
-				<property>/sim/ai-traffic/enabled</property>
+				<property>/sim/traffic-manager/enabled</property>
 			</checkbox>
 
-			<group>
-				<layout>hbox</layout>
-
-				<text>
-					<halign>left</halign>
-					<label>AI traffic density:</label>
-				</text>
-
-				<combo>
-					<halign>left</halign>
-					<property>/sim/ai-traffic/level</property>
-					<value>1</value>
-					<value>2</value>
-					<value>3</value>
-				</combo>
-			</group>
-
 		</group>
 
 		<empty>
diff --git a/gui/dialogs/scenario.xml b/gui/dialogs/scenario.xml
index b6c92c2af..cf2f97b71 100644
--- a/gui/dialogs/scenario.xml
+++ b/gui/dialogs/scenario.xml
@@ -54,6 +54,7 @@
     <label>Enable AI traffic</label>
     <name>enable-ai-traffic</name>
     <property>/sim/traffic-manager/enabled</property>
+    <live>true</live>
     <binding>
         <command>dialog-apply</command>
         <object-name>enable-ai-traffic</object-name>
diff --git a/preferences.xml b/preferences.xml
index c17381baf..0ecae3fcf 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -689,12 +689,13 @@ Started September 2000 by David Megginson, david@megginson.com
 		</atc>
 
 		<ai-traffic>
+			<!-- Obsolete and unused - to be removed -->
 			<enabled type="bool" userarchive="y">false</enabled>
 			<level type="int" userarchive="y">1</level>
 		</ai-traffic>
 
 		<traffic-manager>
-			<enabled type="bool">true</enabled>
+			<enabled type="bool" userarchive="y">true</enabled>
 			<heuristics type="bool">true</heuristics>
 			<datafile type="string"></datafile>
 			<instantaneous-action type="bool">false</instantaneous-action>