diff --git a/src/main/java/ru/bvn13/jircbot/bot/ImprovedListenerAdapter.java b/src/main/java/ru/bvn13/jircbot/bot/ImprovedListenerAdapter.java
index ef372c4..7571d64 100644
--- a/src/main/java/ru/bvn13/jircbot/bot/ImprovedListenerAdapter.java
+++ b/src/main/java/ru/bvn13/jircbot/bot/ImprovedListenerAdapter.java
@@ -27,7 +27,9 @@ public class ImprovedListenerAdapter extends ListenerAdapter {
 
     protected boolean isUserOnline(GenericEvent event, String username) {
 
-        List<String> usersNicks = event.getBot().getUserChannelDao().getAllUsers().stream()
+        String channel = getChannelName(event);
+
+        List<String> usersNicks = event.getBot().getUserChannelDao().getChannel(channel).getUsers().stream()
                 .map(u -> u.getNick().toLowerCase()).collect(Collectors.toList());
 
         return usersNicks.contains(username.toLowerCase());
diff --git a/src/main/java/ru/bvn13/jircbot/listeners/DeferredMessagesListener.java b/src/main/java/ru/bvn13/jircbot/listeners/DeferredMessagesListener.java
index d4d6034..553ff2e 100644
--- a/src/main/java/ru/bvn13/jircbot/listeners/DeferredMessagesListener.java
+++ b/src/main/java/ru/bvn13/jircbot/listeners/DeferredMessagesListener.java
@@ -67,7 +67,7 @@ public class DeferredMessagesListener extends ImprovedListenerAdapter {
                     event.respond("Sorry, message cannot be deferred to me.");
                 } else {
                     // deferred to somebody
-                    if (isUserOnline(event, userName)) {
+                    if (isUserOnline(event, commands[0])) {
                         event.respond(String.format("%s is online, tell him/her directly, please.", commands[0]));
                     } else {
                         deferredMessageService.saveDeferredMessage(channelName, userName, commands[0].toLowerCase(), commands[1]);