diff --git a/js/defaults_dialog.js b/js/defaults_dialog.js
index b89f97c5..49171104 100644
--- a/js/defaults_dialog.js
+++ b/js/defaults_dialog.js
@@ -79,23 +79,16 @@ var defaultsDialog = (function () {
 
             privateScope.wizardSettings.push({
                 name: "gpsPort",
-                value: port
-            });
-
-            privateScope.wizardSettings.push({
-                name: "gpsBaud",
-                value: baud
+                value: {
+                    port: port,
+                    baud: baud
+                }
             });
 
             privateScope.wizardSettings.push({
                 name: "gpsProtocol",
                 value: protocol
             });
-
-            // privateScope.wizardSettings.push({
-            // });
-
-            // let gpsBit = FC.getFeatures().find( feature => feature.name === 'GPS' ).bit;
         }
 
         privateScope.wizard(selectedDefaultPreset, wizardStep + 1);
diff --git a/js/wizard_save_framework.js b/js/wizard_save_framework.js
index dd839d46..71cbdd33 100644
--- a/js/wizard_save_framework.js
+++ b/js/wizard_save_framework.js
@@ -23,19 +23,19 @@ var wizardSaveFramework = (function () {
                 
                 let gpsBit = FC.getFeatures().find( feature => feature.name === 'GPS' ).bit;
 
-                if (config.value == '-1') {
+                if (config.value.port == '-1') {
                     features.unset(gpsBit);
                 } else {
                     features.set(gpsBit);
                 }
 
-                features.execute(callback);
-                break;
-            case 'gpsBaud':
-                console.log(config);
+                serialPortHelper.set(config.value.port, 'GPS', config.value.baud);
+                mspHelper.saveSerialPorts(function () {
+                    features.execute(callback);
+                });
                 break;
             case 'gpsProtocol':
-                console.log(config);
+                mspHelper.setSetting('gps_provider', config.value, callback);
                 break;
             default:
                 callback();