diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
index 125f5d938..1bac27ec5 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
@@ -33,6 +33,7 @@
 #include "mixersettings.h"
 #include "systemsettings.h"
 #import "manualcontrolsettings.h"
+#import "stabilizationsettings.h"
 
 VehicleConfigurationHelper::VehicleConfigurationHelper(VehicleConfigurationSource *configSource)
     : m_configSource(configSource), m_uavoManager(0),
@@ -61,6 +62,7 @@ bool VehicleConfigurationHelper::setupVehicle()
     applyOutputConfiguration();
     applyFlighModeConfiguration();
     applyLevellingConfiguration();
+    applyStabilizationConfiguration();
 
     bool result = saveChangesToController();
     if(result) {
@@ -282,10 +284,21 @@ void VehicleConfigurationHelper::applyLevellingConfiguration()
         data.GyroBias[2] = -bias.m_gyroZBias;
 
         attitudeSettings->setData(data);
-        addModifiedObject(attitudeSettings, tr("Writing levelling bias settings"));
+        addModifiedObject(attitudeSettings, tr("Writing gyro and accelerometer bias settings"));
     }
 }
 
+void VehicleConfigurationHelper::applyStabilizationConfiguration()
+{
+    StabilizationSettings *stabSettings = StabilizationSettings::GetInstance(m_uavoManager);
+    Q_ASSERT(stabSettings);
+    StabilizationSettings::DataFields data = stabSettings->getData();
+
+    StabilizationSettings defaultSettings;
+    stabSettings->setData(defaultSettings.getData());
+    addModifiedObject(stabSettings, tr("Writing stabilization settings"));
+}
+
 void VehicleConfigurationHelper::applyMixerConfiguration(mixerSettings mixer)
 {
     // Set all mixer data
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h
index d5efb543f..d24fa973c 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h
+++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h
@@ -72,7 +72,7 @@ private:
     static const int MIXER_TYPE_MOTOR = 1;
     static const int MIXER_TYPE_SERVO = 2;
 
-    static const int PROGRESS_STEPS = 9;
+    static const int PROGRESS_STEPS = 10;
 
     VehicleConfigurationSource *m_configSource;
     UAVObjectManager *m_uavoManager;
@@ -86,6 +86,7 @@ private:
     void applyOutputConfiguration();
     void applyFlighModeConfiguration();
     void applyLevellingConfiguration();
+    void applyStabilizationConfiguration();
 
     void applyMixerConfiguration(mixerSettings mixer);