diff --git a/gui/src/components/main.vue b/gui/src/components/main.vue
index 070efcdd..aa19fcf5 100644
--- a/gui/src/components/main.vue
+++ b/gui/src/components/main.vue
@@ -7,7 +7,6 @@ import main_modals from "./main_modals.vue";
 import main_top_navbar from "./main_top_navbar.vue";
 import main_audio from "./main_audio.vue";
 import main_rig_control from "./main_rig_control.vue";
-import main_my_station from "./main_my_station.vue";
 import main_updater from "./main_updater.vue";
 import settings_view from "./settings.vue";
 import main_active_rig_control from "./main_active_rig_control.vue";
@@ -173,7 +172,6 @@ function stopAllTransmissions() {
                   id="collapseSecondRow"
                 >
                   <div class="col">
-                    <main_my_station />
                   </div>
                   <div class="col">
                     <main_updater />
diff --git a/gui/src/components/settings.vue b/gui/src/components/settings.vue
index 3f5a7fd4..f06ec1e6 100644
--- a/gui/src/components/settings.vue
+++ b/gui/src/components/settings.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import settings_station from "./settings_station.vue";
 import settings_gui from "./settings_gui.vue";
 import settings_chat from "./settings_chat.vue";
 import settings_hamlib from "./settings_hamlib.vue";
@@ -28,6 +29,20 @@ import settings_exp from "./settings_exp.vue";
             <li class="nav-item" role="presentation">
               <button
                 class="nav-link active"
+                id="station-tab"
+                data-bs-toggle="tab"
+                data-bs-target="#station"
+                type="button"
+                role="tab"
+                aria-controls="home"
+                aria-selected="true"
+              >
+                Station
+              </button>
+            </li>
+            <li class="nav-item" role="presentation">
+              <button
+                class="nav-link"
                 id="gui-tab"
                 data-bs-toggle="tab"
                 data-bs-target="#gui"
@@ -113,10 +128,22 @@ import settings_exp from "./settings_exp.vue";
         </div>
         <div class="card-body">
           <!-- SETTINGS Nav Tab panes -->
+
+          <!-- Station tab contents-->
           <div class="tab-content">
-            <!-- GUI tab contents-->
             <div
               class="tab-pane active"
+              id="station"
+              role="tabpanel"
+              aria-labelledby="station-tab"
+              tabindex="0"
+            >
+              <settings_station />
+            </div>
+
+            <!-- GUI tab contents-->
+            <div
+              class="tab-pane"
               id="gui"
               role="tabpanel"
               aria-labelledby="gui-tab"
diff --git a/gui/src/components/settings_station.vue b/gui/src/components/settings_station.vue
new file mode 100644
index 00000000..4237c3e1
--- /dev/null
+++ b/gui/src/components/settings_station.vue
@@ -0,0 +1,76 @@
+<script setup lang="ts">
+import { saveSettingsToFile } from "../js/settingsHandler";
+
+import { setActivePinia } from "pinia";
+import pinia from "../store/index";
+setActivePinia(pinia);
+
+import { useSettingsStore } from "../store/settingsStore.js";
+const settings = useSettingsStore(pinia);
+
+function saveSettings() {
+  saveSettingsToFile();
+}
+</script>
+<template>
+
+  <!-- station callsign -->
+  <div class="input-group input-group-sm mb-1">
+      <span class="input-group-text" style="width: 180px">Your station callsign</span>
+      <input
+        type="text"
+        class="form-control"
+        placeholder="Enter your callsign and save it"
+        id="myCall"
+        aria-label="Station Callsign"
+        aria-describedby="basic-addon1"
+        @change="saveSettings"
+        v-model="settings.mycall"
+      />
+  </div>
+
+  <!-- station ssid -->
+  <div class="input-group input-group-sm mb-1">
+    <span class="input-group-text" style="width: 180px">Call SSID</span>
+    <select
+      class="form-select form-select-sm w-50"
+      id="myCallSSID"
+      @change="saveSettings"
+      v-model="settings.myssid"
+    >
+      <option selected value="0">0</option>
+      <option value="1">1</option>
+      <option value="2">2</option>
+      <option value="3">3</option>
+      <option value="4">4</option>
+      <option value="5">5</option>
+      <option value="6">6</option>
+      <option value="7">7</option>
+      <option value="8">8</option>
+      <option value="9">9</option>
+      <option value="10">10</option>
+      <option value="11">11</option>
+      <option value="12">12</option>
+      <option value="13">13</option>
+      <option value="14">14</option>
+      <option value="15">15</option>
+    </select>
+  </div>
+
+  <!-- station grid locator -->
+  <div class="input-group input-group-sm mb-1">
+      <span class="input-group-text" style="width: 180px">Grid Locator</span>
+      <input
+        type="text"
+        class="form-control"
+        placeholder="Your grid locator"
+        id="myGrid"
+        maxlength="6"
+        aria-label="Station Grid Locator"
+        aria-describedby="basic-addon1"
+        @change="saveSettings"
+        v-model="settings.mygrid"
+      />
+  </div>
+
+</template>