diff --git a/server/notification-providers/cellsynt.js b/server/notification-providers/cellsynt.js
index ad08aacb..9032e98a 100644
--- a/server/notification-providers/cellsynt.js
+++ b/server/notification-providers/cellsynt.js
@@ -9,7 +9,6 @@ class Cellsynt extends NotificationProvider {
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         const okMsg = "Sent Successfully.";
-
         let data = {
             // docs at https://www.cellsynt.com/en/sms/api-integration
             params: {
@@ -24,7 +23,10 @@ class Cellsynt extends NotificationProvider {
         };
         try {
             const resp = await axios.post("https://se-1.cellsynt.net/sms.php", null, data);
-            if (resp.data == null || resp.data.includes("Error")) {
+            if (resp.data == null ) {
+                throw new Error("Error: Could not connect to Cellsynt, please try again.");
+            } else if (resp.data.includes("Error:")) {       
+                resp.data = resp.data.replaceAll("Error:", "");
                 throw new Error(resp.data);
             }
             return okMsg;
diff --git a/src/components/notifications/Cellsynt.vue b/src/components/notifications/Cellsynt.vue
index f212aaae..f87ebda3 100644
--- a/src/components/notifications/Cellsynt.vue
+++ b/src/components/notifications/Cellsynt.vue
@@ -10,17 +10,19 @@
     <div class="mb-3">
         <label for="cellsynt-Originatortype" class="form-label">{{ $t("Originator type") }}</label>
         <select id="cellsynt-Originatortype" v-model="$parent.notification.cellsyntOriginatortype" :required="true" class="form-select">
-            <option value="alpha">{{ $t("Alpha (recommended)") }}</option>
-            <option value="numeric">{{ $t("Numeric") }}</option>
+            <option value="alpha">{{ $t("Alphanumeric (recommended)") }}</option>
+            <option value="numeric">{{ $t("Telephone number") }}</option>
         </select>
         <div class="form-text">
-            <p><b>{{ $t("Alpha (recommended)") }}:</b><br /> {{ $t("Alphanumeric string (max 11 alphanumeric characters). Recipients can not reply to the message.") }}</p>
-            <p><b>{{ $t("Numeric") }}:</b><br /> {{ $t("Numeric value (max 15 digits) with telephone number on international format without leading 00 (example UK number 07920 110 000 should be set as 447920110000). Recipients can reply to the message.") }}</p>
+            <p><b>{{ $t("Alphanumeric (recommended)") }}:</b><br /> {{ $t("Alphanumeric string (max 11 alphanumeric characters). Recipients can not reply to the message.") }}</p>
+            <p><b>{{ $t("Telephone number") }}:</b><br /> {{ $t("Numeric value (max 15 digits) with telephone number on international format without leading 00 (example UK number 07920 110 000 should be set as 447920110000). Recipients can reply to the message.") }}</p>
         </div>
     </div>
     <div class="mb-3">
-        <label for="cellsynt-originator" class="form-label">{{ $t("Originator") }}</label>
-        <input id="cellsynt-originator" v-model="$parent.notification.cellsyntOriginator" type="text" class="form-control" required>
+        <label for="cellsynt-originator" class="form-label" v-if="$parent.notification.cellsyntOriginatortype == 'alpha'">{{ $t("Originator") }} <small>{{ $t("(max 11 alphanumeric characters)") }}</small></label>
+        <label for="cellsynt-originator" class="form-label" v-if="$parent.notification.cellsyntOriginatortype == 'numeric'">{{ $t("Originator") }} <small>{{ $t("(max 15 digits)") }}</small></label>
+        <input id="cellsynt-originator" v-if="$parent.notification.cellsyntOriginatortype == 'alpha'" v-model="$parent.notification.cellsyntOriginator" type="text" class="form-control" pattern="[a-zA-Z0-9\s]+" maxlength="11" required>
+        <input id="cellsynt-originator" v-if="$parent.notification.cellsyntOriginatortype == 'numeric'" v-model="$parent.notification.cellsyntOriginator" type="number" class="form-control" pattern="[0-9]+" maxlength="15" required>
         <div class="form-text"><p>{{ $t("Visible on recipient's mobile phone as originator of the message. Allowed values and function depends on parameter originatortype.") }}</p></div>
     </div>
     <div class="mb-3">
@@ -46,8 +48,12 @@ export default {
         HiddenInput
     },
     mounted() {
-        this.$parent.notification.cellsyntOriginator = "uptime-kuma";
+        if (this.$parent.notification.cellsyntOriginatortype == null || this.$parent.notification.cellsyntOriginatortype == "") {
         this.$parent.notification.cellsyntOriginatortype = "alpha";
+        }
+        if (this.$parent.notification.cellsyntOriginator == null || this.$parent.notification.cellsyntOriginator == "") {
+            this.$parent.notification.cellsyntOriginator = "uptimekuma";
+        }
     }
 };
 </script>
diff --git a/src/lang/en.json b/src/lang/en.json
index d1364657..3c2f4f51 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -894,8 +894,8 @@
     "To Phone Number": "To Phone Number",
     "gtxMessagingToHint": "International format, with leading \"+\" ({e164}, {e212} or {e214})",
     "Originator type": "Originator type",
-    "Alpha (recommended)": "Alpha (recommended)",
-    "Numeric": "Numeric",
+    "Alphanumeric (recommended)": "Alphanumeric (recommended)",
+    "Telephone number": "Telephone number",
     "Alphanumeric string (max 11 alphanumeric characters). Recipients can not reply to the message.": "Alphanumeric string (max 11 alphanumeric characters). Recipients can not reply to the message.",
     "Numeric value (max 15 digits) with telephone number on international format without leading 00 (example UK number 07920 110 000 should be set as 447920110000). Recipients can reply to the message.": "Numeric value (max 15 digits) with telephone number on international format without leading 00 (example UK number 07920 110 000 should be set as 447920110000). Recipients can reply to the message.",
     "Originator": "Originator",