diff --git a/broker/src/main/java/io/moquette/imhandler/CreateChannelHandler.java b/broker/src/main/java/io/moquette/imhandler/CreateChannelHandler.java
index f619a40f..bcc7d937 100644
--- a/broker/src/main/java/io/moquette/imhandler/CreateChannelHandler.java
+++ b/broker/src/main/java/io/moquette/imhandler/CreateChannelHandler.java
@@ -41,7 +41,7 @@ public class CreateChannelHandler extends GroupHandler<WFCMessage.ChannelInfo> {
         if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
             WFCMessage.ModifyUserSettingReq modifyUserSettingReq = WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingMyChannels).setKey(request.getTargetId()).setValue("1").build();
             mServer.internalRpcMsg(fromUser, null, modifyUserSettingReq.toByteArray(), 0, fromUser, PutUserSettingTopic, false);
-            byte[] data = request.getSecret().getBytes();
+            byte[] data = request.getTargetId().getBytes();
             ackPayload.ensureWritable(data.length).writeBytes(data);
             return ErrorCode.ERROR_CODE_SUCCESS;
         } else {
diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
index 2c00cd2a..94f8071c 100755
--- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
@@ -306,7 +306,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                 notifyReceivers.add(fromUser);
                 if (channelInfo.getOwner().equals(fromUser)) {
                     MultiMap<String, String> listeners = hzInstance.getMultiMap(CHANNEL_LISTENERS);
-                    if (StringUtil.isNullOrEmpty(message.getToUser())) {
+                    if (!StringUtil.isNullOrEmpty(message.getToUser())) {
                         if (listeners.values().contains(message.getToUser())) {
                             notifyReceivers.add(message.getToUser());
                         }