diff --git a/srcs/channel.cpp b/srcs/channel.cpp
index 817ba4b..0c629f3 100644
--- a/srcs/channel.cpp
+++ b/srcs/channel.cpp
@@ -6,7 +6,7 @@
 /*   By: vvaas <vvaas@student.42angouleme.fr>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/21 10:36:21 by maldavid          #+#    #+#             */
-/*   Updated: 2024/01/25 21:46:29 by vvaas            ###   ########.fr       */
+/*   Updated: 2024/01/25 22:45:17 by vvaas            ###   ########.fr       */
 /*                                                                            */
 /******************************************************************************/
 
@@ -34,6 +34,7 @@ namespace irc
 			_operators.insert(client);
 		for(client_it it = _clients.begin(); it != _clients.end(); ++it)
 			const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), "JOIN", _name);
+		sendWho(client);
 	}
 
 	void Channel::ModOperator(unstd::SharedPtr<class Client> client, const std::string &clientname, bool mode)
@@ -72,15 +73,18 @@ namespace irc
 
 	void Channel::sendWho(unstd::SharedPtr<Client> client)
 	{
-		std::string clientlist(":yipirc " RPL_NAMREPLY " " + client->getNickName() + " = " + getName() + ": ");
+		std::string clientlist(":yipirc " RPL_NAMREPLY " " + client->getNickName() + " @ " + getName() + " :");
 		
 		for (client_it it = _clients.begin(); it != _clients.end(); ++it)
 		{
+			if (isOp(const_cast<unstd::SharedPtr<irc::Client>&>(*it)))
+				clientlist += '@';
 			clientlist += const_cast<unstd::SharedPtr<irc::Client>&>(*it)->getNickName() + ' ';
 		}
 		logs::report(log_message, "%s", clientlist.c_str());
 		client->sendModular("%s\r\n", clientlist.c_str());
-		client->sendModular("%s %s %s : End of names list\r\n", RPL_ENDOFNAMES, client->getNickName().c_str(), getName().c_str());
+		clientlist = ":yipirc " RPL_NAMREPLY " " + client->getNickName() + " @ " + getName() + " :";
+		client->sendModular(":yipirc %s %s %s : End of names list\r\n", RPL_ENDOFNAMES, client->getNickName().c_str(), getName().c_str());
 	}
 
 	void Channel::handleMessage(const std::string& msg, unstd::SharedPtr<Client> client, bool notice) const
diff --git a/srcs/server_functions.cpp b/srcs/server_functions.cpp
index 93584d9..f321b11 100644
--- a/srcs/server_functions.cpp
+++ b/srcs/server_functions.cpp
@@ -6,7 +6,7 @@
 /*   By: vvaas <vvaas@student.42angouleme.fr>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/22 17:31:06 by maldavid          #+#    #+#             */
-/*   Updated: 2024/01/25 21:21:04 by maldavid         ###   ########.fr       */
+/*   Updated: 2024/01/25 22:04:39 by vvaas            ###   ########.fr       */
 /*                                                                            */
 /******************************************************************************/
 
@@ -78,7 +78,7 @@ namespace irc
 		if(msg.getTokens()[1] == _password)
 		{
 			client->login();
-			client->sendCode(RPL_WELCOME, "Welcome to yipiirc :)\n");
+			client->sendCode("Welcome to", "yipiirc :)\n");
 		}
 		else
 		{