diff --git a/gui/src/components/settings_station.vue b/gui/src/components/settings_station.vue
index 9d35a3a0..064aa75a 100644
--- a/gui/src/components/settings_station.vue
+++ b/gui/src/components/settings_station.vue
@@ -9,6 +9,11 @@ import {
   validateCallsignWithoutSSID,
 } from "../js/freedata";
 function validateCall() {
+
+//ensure callsign is uppercase:
+    let call = settings.remote.STATION.mycall
+    settings.remote.STATION.mycall = call.toUpperCase()
+
   if (validateCallsignWithoutSSID(settings.remote.STATION.mycall))
     //Send new callsign to modem if valid
     onChange();
@@ -25,6 +30,7 @@ function validateCall() {
     <input
       type="text"
       class="form-control"
+      style="text-transform: uppercase"
       placeholder="Enter your callsign and save it"
       id="myCall"
       aria-label="Station Callsign"
diff --git a/gui/src/js/freedata.ts b/gui/src/js/freedata.ts
index 17c816bd..2e6031bb 100644
--- a/gui/src/js/freedata.ts
+++ b/gui/src/js/freedata.ts
@@ -65,7 +65,7 @@ export function sortByPropertyDesc(property) {
  */
 export function validateCallsignWithSSID(callsign: string) {
   var patt = new RegExp("^[A-Z]+[0-9][A-Z]*-(1[0-5]|[0-9])$");
-
+    callsign = callsign
   if (
     callsign === undefined ||
     callsign === "" ||
diff --git a/modem/message_system_db_manager.py b/modem/message_system_db_manager.py
index 7836a21f..6de5bc1a 100644
--- a/modem/message_system_db_manager.py
+++ b/modem/message_system_db_manager.py
@@ -175,7 +175,7 @@ class DatabaseManager:
     def get_all_messages_json(self):
         messages_dict = self.get_all_messages()
         messages_with_header = {'total_messages' : len(messages_dict), 'messages' : messages_dict}
-        return json.dumps(messages_with_header)  # Convert to JSON string
+        return messages_with_header
 
     def get_message_by_id(self, message_id):
         session = self.get_thread_scoped_session()