diff --git a/src/chat/ClientWindow.java b/src/chat/ClientWindow.java
index 3213c4d..0681b14 100644
--- a/src/chat/ClientWindow.java
+++ b/src/chat/ClientWindow.java
@@ -48,7 +48,7 @@ public class ClientWindow implements ActionListener {
         {
         	username = JOptionPane.showInputDialog(chatWindow,
                     "Enter a username",
-                    "POPUPOPOPUPUPOPOPUP",
+                    "Login",
                     JOptionPane.PLAIN_MESSAGE);
         	
         	connected = network.connect(username);
diff --git a/src/chat/NetworkClient.java b/src/chat/NetworkClient.java
index 7cdda4d..4fc4e0d 100644
--- a/src/chat/NetworkClient.java
+++ b/src/chat/NetworkClient.java
@@ -72,9 +72,9 @@ class ReceiveThread extends Thread {
 		boolean exit = false;
 		try
     	{
-			ObjectInputStream in = new ObjectInputStream(socket.getInputStream());
 			while(!exit)
 			{
+					ObjectInputStream in = new ObjectInputStream(socket.getInputStream());
 			        Message message = (Message) in.readObject();
 		        	if(message.getText() != null)
 		        	{
@@ -364,7 +364,9 @@ public class NetworkClient {
         	  	ServerSocket s1 = new ServerSocket(portNumber);
         	  	(new ListenerStartThread(s1, dest_sockets)).start();
         	  	
-        	  	Socket s2 = new Socket("25.67.234.235", portNumber);
+        	  	Socket s2 = new Socket(getLocalIP(), portNumber);
+        	  	/*Attention! getLocalIP ne marche que si les machines sont sur un même réseau local physique
+        	  	 Pour tester avec Hamachi, il faut hardcoder les IP*/
 	  			(new ReceiveThread(user, s2, chatText, known_users, knownUsersPanel, dest_sockets)).start();
           }
           catch(IOException e)
diff --git a/src/chat/module-info.java b/src/chat/module-info.java
deleted file mode 100644
index 78e1762..0000000
--- a/src/chat/module-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package chat;
\ No newline at end of file