diff --git a/README.md b/README.md
index 459db33..6a9515d 100644
--- a/README.md
+++ b/README.md
@@ -356,9 +356,9 @@ There is no direct support for MQTT in the code, however, reports from Discord a
 | `bbllink` | Links Bulletin Messages between BBS Systems | ✅ |
 | `email:`  | Sends email to address on file for the node or `email: bob@test.net # hello from mesh` | |
 | `sms:`    | Send sms-email to multiple address on file | |
-| `setemail:`| Sets the email for node communciations | |
-| `setsms:` | Sets the SMS-Email for node communications | |
-| `clearsms:` | Clears all SMS-Emails on file for node | |
+| `setemail`| Sets the email for node communciations | |
+| `setsms` | Sets the SMS-Email for node communications | |
+| `clearsms` | Clears all SMS-Emails on file for node | |
 
 ### Data Lookup 
 | Command | Description | |
diff --git a/mesh_bot.py b/mesh_bot.py
index f09f4a6..9a79157 100755
--- a/mesh_bot.py
+++ b/mesh_bot.py
@@ -39,7 +39,7 @@ def auto_response(message, snr, rssi, hop, pkiStatus, message_from_id, channel_n
     "bbspost": lambda: handle_bbspost(message, message_from_id, deviceID),
     "bbsread": lambda: handle_bbsread(message),
     "blackjack": lambda: handleBlackJack(message, message_from_id, deviceID),
-    "clearsms:": lambda: handle_sms(message_from_id, message),
+    "clearsms": lambda: handle_sms(message_from_id, message),
     "cmd": lambda: help_message,
     "cq": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
     "cqcq": lambda: handle_ping(message_from_id, deviceID, message, hop, snr, rssi, isDM, channel_number),
@@ -63,8 +63,8 @@ def auto_response(message, snr, rssi, hop, pkiStatus, message_from_id, channel_n
     "pong": lambda: "🏓PING!!🛜",
     "readnews": lambda: read_news(),
     "rlist": lambda: handle_repeaterQuery(message_from_id, deviceID, channel_number),
-    "setemail:": lambda: handle_email(message_from_id, message),
-    "setsms:": lambda: handle_sms( message_from_id, message),
+    "setemail": lambda: handle_email(message_from_id, message),
+    "setsms": lambda: handle_sms( message_from_id, message),
     "sitrep": lambda: handle_lheard(message, message_from_id, deviceID, isDM),
     "sms:": lambda: handle_sms(message_from_id, message),
     "solar": lambda: drap_xray_conditions() + "\n" + solar_conditions(),
diff --git a/modules/smtp.py b/modules/smtp.py
index 55bfd0d..6e11c04 100644
--- a/modules/smtp.py
+++ b/modules/smtp.py
@@ -11,7 +11,7 @@ from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 
 # System variables
-trap_list_smtp = ("email:", "setemail:", "sms:", "setsms:", "clearsms:")
+trap_list_smtp = ("email:", "setemail", "sms:", "setsms", "clearsms")
 smtpThrottle = {}
 SMTP_TIMEOUT = 10
 
@@ -233,7 +233,7 @@ def handle_email(nodeID, message):
         if message.lower().startswith("email:"):
             parts = message.split(" ", 1)
             if len(parts) < 2:
-                return "Error: ⛔️ Message format should be: email: address@example.com #message"
+                return "Error: ⛔️ format should be: email: message  or, email: address@example.com #message"
                 
             content = parts[1].strip()
             
@@ -258,8 +258,8 @@ def handle_email(nodeID, message):
                 if send_email(email_db[nodeID], content, nodeID):
                     return "📧Email-sent 📤"
                 return "⛔️Failed to send email"
-                
-            return "Error: ⛔️ Please use: email: address@example.com #Hello Bob"
+        
+        return "Error: ⛔️ no email on file. use: setemail"
             
     except Exception as e:
         logger.error(f"System: Email handling error: {str(e)}")
diff --git a/modules/system.py b/modules/system.py
index 5f4955a..6ec5d2e 100644
--- a/modules/system.py
+++ b/modules/system.py
@@ -42,7 +42,7 @@ if motd_enabled:
 if enableSMTP:
     from modules.smtp import * # from the spudgunman/meshing-around repo
     trap_list = trap_list + trap_list_smtp
-    help_message = help_message + ", email, sms"
+    help_message = help_message + ", email:, sms:"
 
 # Emergency Responder Configuration
 if emergency_responder_enabled: