diff --git a/XiaoBot.js b/XiaoBot.js
index 307a54e0..4c21cddb 100644
--- a/XiaoBot.js
+++ b/XiaoBot.js
@@ -70,7 +70,7 @@ client.on('guildMemberAdd', (member) => {
     }).first() || member.guild.channels.find('name', 'member-log');
     if (!channel || !channel.permissionsFor(client.user).has('SEND_MESSAGES')) return;
     const parseMsg = (topic) => {
-        if (!topic || !/(<joinmessage.+>)/gi.test(topic)) return '';
+        if (!topic || !/(<joinmessage:.+>)/gi.test(topic)) return '';
         const setting = topic.match(/(<joinmessage:.+>)/gi)[0];
         return setting.slice(13, setting.length - 1)
             .replace(/(\(member\))/gi, member.user.username)
@@ -88,9 +88,9 @@ client.on('guildMemberRemove', (member) => {
     }).first() || member.guild.channels.find('name', 'member-log');
     if (!channel || !channel.permissionsFor(client.user).has('SEND_MESSAGES')) return;
     const parseMsg = (topic) => {
-        if (!topic || !/(<leavemessage.+>)/gi.test(topic)) return '';
+        if (!topic || !/(<leavemessage:.+>)/gi.test(topic)) return '';
         const setting = topic.match(/(<leavemessage:.+>)/gi)[0];
-        return setting.slice(13, setting.length - 1)
+        return setting.slice(14, setting.length - 1)
             .replace(/(\(member\))/gi, member.user.username)
             .replace(/(\(server\))/gi, member.guild.name)
             .replace(/(\(mention\))/gi, member.toString());