diff --git a/ground/openpilotgcs/src/plugins/config/airframe_custom.ui b/ground/openpilotgcs/src/plugins/config/airframe_custom.ui
index f061c6456..3cbc46b97 100644
--- a/ground/openpilotgcs/src/plugins/config/airframe_custom.ui
+++ b/ground/openpilotgcs/src/plugins/config/airframe_custom.ui
@@ -82,9 +82,12 @@
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="toolTip">
+             <string>The source of Curve 1 will always be Throttle</string>
+            </property>
             <item>
              <property name="text">
-              <string>Thrust</string>
+              <string>Throttle</string>
              </property>
             </item>
            </widget>
@@ -173,11 +176,6 @@
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <item>
-             <property name="text">
-              <string>Thrust</string>
-             </property>
-            </item>
            </widget>
           </item>
          </layout>
diff --git a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
index 93ca08668..02ecb5b65 100644
--- a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
@@ -191,9 +191,9 @@ void ConfigVehicleTypeWidget::switchAirframeType(int index)
    Note: The default behavior of ConfigTaskWidget is bypassed.
    Therefore no automatic synchronization of UAV Objects to UI is done.
  */
-void ConfigVehicleTypeWidget::refreshWidgetsValues(UAVObject *o)
+void ConfigVehicleTypeWidget::refreshWidgetsValues(UAVObject *object)
 {
-    Q_UNUSED(o);
+    ConfigTaskWidget::refreshWidgetsValues(object);
 
     if (!allObjectsUpdated()) {
         return;
@@ -248,7 +248,6 @@ void ConfigVehicleTypeWidget::refreshWidgetsValues(UAVObject *o)
     m_aircraft->nameEdit->setText(name);
 
     updateFeedForwardUI();
-
     setDirty(dirty);
 }
 
@@ -306,6 +305,7 @@ void ConfigVehicleTypeWidget::updateObjectsFromWidgets()
 
     // call refreshWidgetsValues() to reflect actual saved values
     refreshWidgetsValues();
+    ConfigTaskWidget::updateObjectsFromWidgets();
     updateFeedForwardUI();
 }
 
diff --git a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.h b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.h
index be40b4d48..3680e928d 100644
--- a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.h
+++ b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.h
@@ -69,7 +69,7 @@ public:
     ~ConfigVehicleTypeWidget();
 
 protected slots:
-    virtual void refreshWidgetsValues(UAVObject *o = NULL);
+    virtual void refreshWidgetsValues(UAVObject *object = NULL);
     virtual void updateObjectsFromWidgets();
 
 private: