diff --git a/Firmware/RTK_Surveyor/AP-Config/index.html b/Firmware/RTK_Surveyor/AP-Config/index.html
index 604a72176..4b79cfa1b 100644
--- a/Firmware/RTK_Surveyor/AP-Config/index.html
+++ b/Firmware/RTK_Surveyor/AP-Config/index.html
@@ -87,12 +87,39 @@ <h2>
             <div align="center" class="small">
                 <span id="rtkFirmwareVersion" style="display:inline;">RTK Firmware: v0.0</span> <br>
                 <span id="zedFirmwareVersion" style="display:inline;">ZED-F9P Firmware: v0.0</span> <br>
-                <span id="profileName" style="display:inline;">Profile Name: Default</span>
             </div>
         </div>
 
         <hr class="mt-0">
         <div style="margin-top:20px;">
+
+            <!-- --------- Profile Config --------- -->
+            <div class="d-grid gap-2">
+                <button class="btn btn-primary mt-3 toggle-btn" id="profileConfig" type="button" data-toggle="collapse"
+                    data-target="#collapseProfileConfig" aria-expanded="false" aria-controls="collapseProfileConfig">
+                    Profile Configuration <i id="profileCaret" class="caret-icon bi icon-caret-down"></i>
+                </button>
+            </div>
+            <div class="collapse mb-2" id="collapseProfileConfig">
+                <div class="card card-body">
+                    <div class="form-group row">
+                        <label for="profileNumber" class="box-margin20 col-sm-3 col-4 col-form-label">Profile Number</label>
+                        <div class="col-sm-8 col-7">
+                            <input type="number" class="form-control mb-2" id="profileNumber">
+                            <p id="profileNumberError" class="inlineError"></p>
+                        </div>
+                    </div>
+
+                    <div class="form-group row">
+                        <label for="profileName" class="box-margin20 col-sm-3 col-4 col-form-label">Profile Name</label>
+                        <div class="col-sm-8 col-7">
+                            <input type="text" class="form-control" id="profileName">
+                            <p id="profileNameError" class="inlineError"></p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
             <!-- --------- GNSS Config --------- -->
             <div class="d-grid gap-2">
                 <button class="btn btn-primary toggle-btn" type="button" data-toggle="collapse"
diff --git a/Firmware/RTK_Surveyor/AP-Config/src/main.js b/Firmware/RTK_Surveyor/AP-Config/src/main.js
index 01841c456..09c2f24f0 100644
--- a/Firmware/RTK_Surveyor/AP-Config/src/main.js
+++ b/Firmware/RTK_Surveyor/AP-Config/src/main.js
@@ -82,7 +82,6 @@ function parseIncoming(msg) {
             || id.includes("sdUsedSpace")
             || id.includes("rtkFirmwareVersion")
             || id.includes("zedFirmwareVersion")
-            || id.includes("profileName")
             || id.includes("hardwareID")
             || id.includes("daysRemaining")
         ) {
@@ -123,6 +122,8 @@ function parseIncoming(msg) {
     //console.log("Settings loaded");
 
     //Force element updates
+    ge("profileNumber").dispatchEvent(new CustomEvent('change'));
+    ge("profileName").dispatchEvent(new CustomEvent('change'));
     ge("measurementRateHz").dispatchEvent(new CustomEvent('change'));
     ge("baseTypeSurveyIn").dispatchEvent(new CustomEvent('change'));
     ge("baseTypeFixed").dispatchEvent(new CustomEvent('change'));
@@ -195,6 +196,7 @@ function collapseSection(section, caret) {
 
 function validateFields() {
     //Collapse all sections
+    collapseSection("collapseProfileConfig", "profileCaret");
     collapseSection("collapseGNSSConfig", "gnssCaret");
     collapseSection("collapseGNSSConfigMsg", "gnssMsgCaret");
     collapseSection("collapseBaseConfig", "baseCaret");
@@ -205,6 +207,10 @@ function validateFields() {
 
     errorCount = 0;
 
+    //Profile Config
+    checkElementValue("profileNumber", 1, 4, "Must be between 1 and 4", "collapseProfileConfig");
+    checkElementString("profileName", 1, 49, "Must be 1 to 49 characters", "collapseProfileConfig");
+
     //GNSS Config
     checkElementValue("measurementRateHz", 0.00012, 10, "Must be between 0.00012 and 10Hz", "collapseGNSSConfig");
     checkConstellations();
diff --git a/Firmware/RTK_Surveyor/Form.ino b/Firmware/RTK_Surveyor/Form.ino
index 81d31843e..7bc3d3c35 100644
--- a/Firmware/RTK_Surveyor/Form.ino
+++ b/Firmware/RTK_Surveyor/Form.ino
@@ -405,9 +405,8 @@ void createSettingsString(char* settingsCSV)
   stringRecord(settingsCSV, "enableExternalHardwareEventLogging", settings.enableExternalHardwareEventLogging);
 
   //Profiles
-  char apProfileName[50];
-  sprintf(apProfileName, "Profile Name: %s", settings.profileName);
-  stringRecord(settingsCSV, "profileName", apProfileName);
+  stringRecord(settingsCSV, "profileNumber", profileNumber + 1);
+  stringRecord(settingsCSV, "profileName", profileNames[profileNumber]);
 
   //New settings not yet integrated
   //...
@@ -423,6 +422,7 @@ void updateSettingWithValue(const char *settingName, const char* settingValueStr
 {
 #ifdef COMPILE_AP
   char* ptr;
+  int newProfileNumber;
   double settingValue = strtod(settingValueStr, &ptr);
 
   bool settingValueBool = false;
@@ -486,7 +486,23 @@ void updateSettingWithValue(const char *settingName, const char* settingValueStr
   else if (strcmp(settingName, "enableExternalHardwareEventLogging") == 0)
     settings.enableExternalHardwareEventLogging = settingValueBool;
   else if (strcmp(settingName, "profileName") == 0)
+  {
     strcpy(settings.profileName, settingValueStr);
+    strcpy(profileNames[profileNumber], settingValueStr);
+  }
+  else if (strcmp(settingName, "profileNumber") == 0)
+  {
+    if ((sscanf(settingValueStr, "%d", &newProfileNumber) == 1)
+      && (newProfileNumber >= 1) && (newProfileNumber <= MAX_PROFILE_COUNT)
+      && (profileNumber != newProfileNumber))
+    {
+      profileNumber = newProfileNumber - 1;
+
+      //Switch to a new profile
+      setSettingsFileName();
+      recordProfileNumber(profileNumber);
+    }
+  }
 
   else if (strcmp(settingName, "enableNtripServer") == 0)
     settings.enableNtripServer = settingValueBool;
diff --git a/Firmware/RTK_Surveyor/NVM.ino b/Firmware/RTK_Surveyor/NVM.ino
index e6919dbb8..34da57576 100644
--- a/Firmware/RTK_Surveyor/NVM.ino
+++ b/Firmware/RTK_Surveyor/NVM.ino
@@ -35,6 +35,12 @@ void loadSettings()
   Serial.printf("Profile '%s' loaded\n\r", profileNames[profileNumber]);
 }
 
+//Set the settingsFileName used many places
+void setSettingsFileName()
+{
+  sprintf(settingsFileName, "/%s_Settings_%d.txt", platformFilePrefix, profileNumber);
+}
+
 //Load only LFS settings without recording
 //Used at very first boot to test for resetCounter
 void loadSettingsPartial()
@@ -43,7 +49,7 @@ void loadSettingsPartial()
   loadProfileNumber();
 
   //Set the settingsFileName used many places
-  sprintf(settingsFileName, "/%s_Settings_%d.txt", platformFilePrefix, profileNumber);
+  setSettingsFileName();
 
   loadSystemSettingsFromFileLFS(settingsFileName, &settings);
 }
@@ -911,9 +917,8 @@ void loadProfileNumber()
   if (!fileProfileNumber)
   {
     log_d("profileNumber.txt not found");
-    profileNumber = 0;
     settings.updateZEDSettings = true; //Force module update
-    recordProfileNumber(profileNumber); //Record profile
+    recordProfileNumber(0); //Record profile
   }
   else
   {
@@ -925,24 +930,24 @@ void loadProfileNumber()
   if (profileNumber >= MAX_PROFILE_COUNT)
   {
     log_d("ProfileNumber invalid. Going to zero.");
-    profileNumber = 0;
     settings.updateZEDSettings = true; //Force module update
-    recordProfileNumber(profileNumber); //Record profile
+    recordProfileNumber(0); //Record profile
   }
 
   log_d("Using profile #%d", profileNumber);
 }
 
 //Record the given profile number as well as a config bool
-void recordProfileNumber(uint8_t profileNumber)
+void recordProfileNumber(uint8_t newProfileNumber)
 {
+  profileNumber = newProfileNumber;
   File fileProfileNumber = LittleFS.open("/profileNumber.txt", FILE_WRITE);
   if (!fileProfileNumber)
   {
     log_d("profileNumber.txt failed to open");
     return;
   }
-  fileProfileNumber.write(profileNumber);
+  fileProfileNumber.write(newProfileNumber);
   fileProfileNumber.close();
 }
 
diff --git a/Firmware/RTK_Surveyor/form.h b/Firmware/RTK_Surveyor/form.h
index 4fb5b774b..f84f3d718 100644
--- a/Firmware/RTK_Surveyor/form.h
+++ b/Firmware/RTK_Surveyor/form.h
@@ -105,7 +105,6 @@ function parseIncoming(msg) {
             || id.includes("sdUsedSpace")
             || id.includes("rtkFirmwareVersion")
             || id.includes("zedFirmwareVersion")
-            || id.includes("profileName")
             || id.includes("hardwareID")
             || id.includes("daysRemaining")
         ) {
@@ -146,6 +145,8 @@ function parseIncoming(msg) {
     //console.log("Settings loaded");
 
     //Force element updates
+    ge("profileNumber").dispatchEvent(new CustomEvent('change'));
+    ge("profileName").dispatchEvent(new CustomEvent('change'));
     ge("measurementRateHz").dispatchEvent(new CustomEvent('change'));
     ge("baseTypeSurveyIn").dispatchEvent(new CustomEvent('change'));
     ge("baseTypeFixed").dispatchEvent(new CustomEvent('change'));
@@ -218,6 +219,7 @@ function collapseSection(section, caret) {
 
 function validateFields() {
     //Collapse all sections
+    collapseSection("collapseProfileConfig", "profileCaret");
     collapseSection("collapseGNSSConfig", "gnssCaret");
     collapseSection("collapseGNSSConfigMsg", "gnssMsgCaret");
     collapseSection("collapseBaseConfig", "baseCaret");
@@ -228,6 +230,10 @@ function validateFields() {
 
     errorCount = 0;
 
+    //Profile Config
+    checkElementValue("profileNumber", 1, 4, "Must be between 1 and 4", "collapseProfileConfig");
+    checkElementString("profileName", 1, 49, "Must be 1 to 49 characters", "collapseProfileConfig");
+
     //GNSS Config
     checkElementValue("measurementRateHz", 0.00012, 10, "Must be between 0.00012 and 10Hz", "collapseGNSSConfig");
     checkConstellations();
@@ -860,12 +866,39 @@ static const char *index_html = R"=====(
             <div align="center" class="small">
                 <span id="rtkFirmwareVersion" style="display:inline;">RTK Firmware: v0.0</span> <br>
                 <span id="zedFirmwareVersion" style="display:inline;">ZED-F9P Firmware: v0.0</span> <br>
-                <span id="profileName" style="display:inline;">Profile Name: Default</span>
             </div>
         </div>
 
         <hr class="mt-0">
         <div style="margin-top:20px;">
+
+            <!-- --------- Profile Config --------- -->
+            <div class="d-grid gap-2">
+                <button class="btn btn-primary mt-3 toggle-btn" id="profileConfig" type="button" data-toggle="collapse"
+                    data-target="#collapseProfileConfig" aria-expanded="false" aria-controls="collapseProfileConfig">
+                    Profile Configuration <i id="profileCaret" class="caret-icon bi icon-caret-down"></i>
+                </button>
+            </div>
+            <div class="collapse mb-2" id="collapseProfileConfig">
+                <div class="card card-body">
+                    <div class="form-group row">
+                        <label for="profileNumber" class="box-margin20 col-sm-3 col-4 col-form-label">Profile Number</label>
+                        <div class="col-sm-8 col-7">
+                            <input type="number" class="form-control mb-2" id="profileNumber">
+                            <p id="profileNumberError" class="inlineError"></p>
+                        </div>
+                    </div>
+
+                    <div class="form-group row">
+                        <label for="profileName" class="box-margin20 col-sm-3 col-4 col-form-label">Profile Name</label>
+                        <div class="col-sm-8 col-7">
+                            <input type="text" class="form-control" id="profileName">
+                            <p id="profileNameError" class="inlineError"></p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
             <!-- --------- GNSS Config --------- -->
             <div class="d-grid gap-2">
                 <button class="btn btn-primary toggle-btn" type="button" data-toggle="collapse"