diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index a795875..a15c9f0 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -521,7 +521,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
             if(*s == '~') {
                 fl |= CHFL_OWNER;
                 s++;
-            } else if(*s == '!') {
+            } else if(*s == '&') {
                 fl |= CHFL_ADMIN;
                 s++;
             } else if(*s == '@') {
@@ -557,7 +557,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
                 len_nick++;
                 len_uid++;
             } else if(fl & CHFL_ADMIN) {
-                *ptr_uid++ = '!';
+                *ptr_uid++ = '&';
                 len_nick++;
                 len_uid++;
             }
diff --git a/src/channel.c b/src/channel.c
index b0da262..a4dfa85 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -188,8 +188,8 @@ find_channel_status(struct membership *msptr, int combine)
     }
     if(is_admin(msptr)) {
         if(!combine)
-            return "!";
-        *p++ = '!';
+            return "&";
+        *p++ = '&';
     }
 
     if(is_chanop(msptr)) {