diff --git a/src/main/java/fr/insa/clavardator/users/ActiveUser.java b/src/main/java/fr/insa/clavardator/users/ActiveUser.java
index 1080148..f8c42bb 100644
--- a/src/main/java/fr/insa/clavardator/users/ActiveUser.java
+++ b/src/main/java/fr/insa/clavardator/users/ActiveUser.java
@@ -10,7 +10,8 @@ public class ActiveUser extends PeerUser {
 
 	private transient PeerConnection connection;
 
-	public ActiveUser(InetAddress ipAddr) {
+	public ActiveUser(String username, InetAddress ipAddr) {
+		super(username);
 		connection = new PeerConnection(ipAddr);
 	}
 
diff --git a/src/main/java/fr/insa/clavardator/users/CurrentUser.java b/src/main/java/fr/insa/clavardator/users/CurrentUser.java
index b29c2ac..945c0d5 100644
--- a/src/main/java/fr/insa/clavardator/users/CurrentUser.java
+++ b/src/main/java/fr/insa/clavardator/users/CurrentUser.java
@@ -2,7 +2,8 @@ package fr.insa.clavardator.users;
 
 public class CurrentUser extends User {
 
-	public CurrentUser(UserList userList) {
+	public CurrentUser(String username, UserList userList) {
+		super(username);
 	}
 
 	/**
diff --git a/src/main/java/fr/insa/clavardator/users/PeerUser.java b/src/main/java/fr/insa/clavardator/users/PeerUser.java
index 3229dae..461b6c6 100644
--- a/src/main/java/fr/insa/clavardator/users/PeerUser.java
+++ b/src/main/java/fr/insa/clavardator/users/PeerUser.java
@@ -6,7 +6,8 @@ public class PeerUser extends User {
 
 	protected transient ChatHistory history;
 
-	public PeerUser() {
+	public PeerUser(String username) {
+		super(username);
 		history = new ChatHistory(this);
 	}
 
diff --git a/src/main/java/fr/insa/clavardator/users/User.java b/src/main/java/fr/insa/clavardator/users/User.java
index dcf4975..172c2ee 100644
--- a/src/main/java/fr/insa/clavardator/users/User.java
+++ b/src/main/java/fr/insa/clavardator/users/User.java
@@ -16,7 +16,9 @@ public class User implements Serializable {
 		pcs.removePropertyChangeListener(listener);
 	}
 
-	public User() {}
+	public User(String username) {
+		this.username = username;
+	}
 
 	/**
 	 * @return the current value of username
diff --git a/src/main/java/fr/insa/clavardator/users/UserList.java b/src/main/java/fr/insa/clavardator/users/UserList.java
index 4637b87..21048fe 100644
--- a/src/main/java/fr/insa/clavardator/users/UserList.java
+++ b/src/main/java/fr/insa/clavardator/users/UserList.java
@@ -49,7 +49,7 @@ public class UserList {
 	 */
 	public void discoverActiveUsers() {
 		NetDiscoverer.discoverActiveUsers((ipAddr, data) -> {
-			ActiveUser newUser = new ActiveUser(ipAddr);
+			ActiveUser newUser = new ActiveUser("", ipAddr); // TODO find username
 			activeUsers.add(newUser);
 			pcs.firePropertyChange("activeUsers", null, newUser);
 		});