diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 5c643696..37166a26 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -712,6 +712,12 @@
     "configurationGPSubxSbas": {
         "message": "Ground Assistance Type"
     },
+    "configurationGPSAutoBaud": {
+        "message": "Auto Baud"
+    },
+    "configurationGPSAutoConfig": {
+        "message": "Auto Config"
+    },
     "configurationGPSHelp": {
         "message": "<strong>Note:</strong> Remember to configure a Serial Port (via Ports tab) when using GPS feature."
     },
diff --git a/js/fc.js b/js/fc.js
index 47e3fdf6..2ace3630 100644
--- a/js/fc.js
+++ b/js/fc.js
@@ -232,6 +232,8 @@ var FC = {
         GPS_CONFIG = {
             provider:               0,
             ublox_sbas:             0,
+            auto_config:            0,
+            auto_baud:              0,
         };
         
         COMPASS_CONFIG = {
diff --git a/js/msp/MSPHelper.js b/js/msp/MSPHelper.js
index c8ccaf00..6141451f 100644
--- a/js/msp/MSPHelper.js
+++ b/js/msp/MSPHelper.js
@@ -329,6 +329,10 @@ MspHelper.prototype.process_data = function(dataHandler) {
             case MSPCodes.MSP_GPS_CONFIG:
                 GPS_CONFIG.provider = data.readU8();
                 GPS_CONFIG.ublox_sbas = data.readU8();
+                if (semver.gte(CONFIG.apiVersion, "1.34.0")) {
+                    GPS_CONFIG.auto_config = data.readU8();
+                    GPS_CONFIG.auto_baud = data.readU8();
+                }
                 break;
             case MSPCodes.MSP_RSSI_CONFIG:
                 RSSI_CONFIG.channel = data.readU8();
@@ -1213,6 +1217,10 @@ MspHelper.prototype.crunch = function(code) {
         case MSPCodes.MSP_SET_GPS_CONFIG:
             buffer.push8(GPS_CONFIG.provider)
                 .push8(GPS_CONFIG.ublox_sbas);
+            if (semver.gte(CONFIG.apiVersion, "1.34.0")) {
+                buffer.push8(GPS_CONFIG.auto_config)
+                    .push8(GPS_CONFIG.auto_baud);
+            }
             break;
         case MSPCodes.MSP_SET_COMPASS_CONFIG:
             buffer.push16(Math.round(COMPASS_CONFIG.mag_declination * 100));
diff --git a/tabs/configuration.html b/tabs/configuration.html
index 2d802242..a872dd61 100644
--- a/tabs/configuration.html
+++ b/tabs/configuration.html
@@ -442,6 +442,22 @@
                             </select>
                             <span i18n="configurationGPSBaudrate"></span>
                         </div>
+                        <div class="select gps_auto_baud">
+                            <div style="float: left; height: 20px; margin-right: 15px; margin-left: 3px;">
+                                <input type="checkbox" name="gps_auto_baud" class="toggle" />
+                            </div>
+                            <label for="gps_auto_baud"> <span class="freelabel"
+                                i18n="configurationGPSAutoBaud"></span>
+                            </label>
+                        </div>
+                        <div class="select gps_auto_config">
+                            <div style="float: left; height: 20px; margin-right: 15px; margin-left: 3px;">
+                                <input type="checkbox" name="gps_auto_config" class="toggle" />
+                            </div>
+                            <label for="gps_auto_config"> <span class="freelabel"
+                                i18n="configurationGPSAutoConfig"></span>
+                            </label>
+                        </div>
                         <div class="line">
                             <select class="gps_ubx_sbas">
                                 <!-- list generated here -->
diff --git a/tabs/configuration.js b/tabs/configuration.js
index 061948ce..fc61e182 100644
--- a/tabs/configuration.js
+++ b/tabs/configuration.js
@@ -408,6 +408,15 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
 
         gps_protocol_e.val(GPS_CONFIG.provider);
 
+        $('input[name="gps_auto_baud"]').prop('checked', GPS_CONFIG.auto_baud == 1);
+        $('input[name="gps_auto_config"]').prop('checked', GPS_CONFIG.auto_config == 1);
+        if (semver.gte(CONFIG.apiVersion, "1.34.0")) {
+            $('.select.gps_auto_baud').show();
+            $('.select.gps_auto_config').show();
+        } else {
+            $('.select.gps_auto_baud').hide();
+            $('.select.gps_auto_config').hide();
+        }
 
         var gps_baudrate_e = $('select.gps_baudrate');
         for (var i = 0; i < gpsBaudRates.length; i++) {
@@ -690,6 +699,11 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
             }
 
             function save_gps_config() {
+                if (semver.gte(CONFIG.apiVersion, "1.34.0")) {
+                    GPS_CONFIG.auto_baud = $('input[name="gps_auto_baud"]').is(':checked') ? 1 : 0;
+                    GPS_CONFIG.auto_config = $('input[name="gps_auto_config"]').is(':checked') ? 1 : 0;
+                }
+
                 var next_callback = save_compass_config;
                 if(semver.gte(CONFIG.apiVersion, "1.33.0")) {
                     MSP.send_message(MSPCodes.MSP_SET_GPS_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_GPS_CONFIG), false, next_callback);
@@ -736,11 +750,11 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
             }
 
             function save_sensor_config() {
-                var next_callback = save_name;
-
                 SENSOR_CONFIG.acc_hardware = $('input[id="accHardwareSwitch"]').is(':checked') ? 0 : 1;
                 SENSOR_CONFIG.baro_hardware = $('input[id="baroHardwareSwitch"]').is(':checked') ? 0 : 1;
                 SENSOR_CONFIG.mag_hardware = $('input[id="magHardwareSwitch"]').is(':checked') ? 0 : 1;
+                
+                var next_callback = save_name;
                 MSP.send_message(MSPCodes.MSP_SET_SENSOR_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_SENSOR_CONFIG), false, next_callback);
             }