diff --git a/app/punishermodule.cpp b/app/punishermodule.cpp
index 3e191db..24091b9 100644
--- a/app/punishermodule.cpp
+++ b/app/punishermodule.cpp
@@ -10,6 +10,10 @@ PunisherModule::PunisherModule()
 
 bool PunisherModule::messageHandler(Message msg)
 {
+    QString target = QString("#").append(getChan());
+    if(msg.target.compare(target) != 0)
+        target = msg.nick;
+    
     if(msg.args.startsWith("!forbidden remove ") && getUsers()->getFromNick(msg.nick)->isOp())
     {
         QStringList str = msg.args.split(' ');
@@ -28,20 +32,20 @@ bool PunisherModule::messageHandler(Message msg)
                 }
             }
             if(found)
-                answer += say(QString("removed %1 to the list of forbidden words").arg(str[i]));
+                answer += privateSay(QString("removed %1 to the list of forbidden words").arg(str[i]), target);
             else
-                answer += say(QString("%1 was not part of the list of forbidden words").arg(str[i]));
+                answer += privateSay(QString("%1 was not part of the list of forbidden words").arg(str[i]), target);
             
         }
         if(i==2)
-            answer = say(QString("missing argument"));
+            answer = privateSay(QString("missing argument"), target);
         return true;
     }
     
     if(msg.args.compare("!forbidden reset") == 0 && getUsers()->getFromNick(msg.nick)->isOp())
     {
         forbidden_words.clear();
-        answer = say(QString("removed all forbidden words"));
+        answer = privateSay(QString("removed all forbidden words"), target);
         return true;
     }
     
@@ -53,10 +57,10 @@ bool PunisherModule::messageHandler(Message msg)
         for(; i<str.size(); ++i)
         {
             forbidden_words.push_back(str[i]);
-            answer += say(QString("added %1 to the list of forbidden words").arg(str[i]));
+            answer += privateSay(QString("added %1 from the list of forbidden words").arg(str[i]), target);
         }
         if(i==2)
-            answer = say(QString("missing argument"));
+            answer = privateSay(QString("missing argument"), target);
         return true;
     }
     
@@ -65,7 +69,7 @@ bool PunisherModule::messageHandler(Message msg)
         QString str = QString("Forbidden words are : ");
         for(const QString &w : forbidden_words)
             str.append(w).append(" ");
-        answer = say(str);
+        answer = privateSay(str, target);
         return true;
     }
     
@@ -76,7 +80,7 @@ bool PunisherModule::messageHandler(Message msg)
     {
         if(msg.args.contains(w, Qt::CaseInsensitive))
         {
-            answer = QString("KICK #%1 %2\r\n").arg(getChan()).arg(msg.nick);
+            answer = QString("KICK #%1 %2 :%3 est un mot interdit !\r\n").arg(getChan()).arg(msg.nick).arg(w);
             return true;
         }
     }