diff --git a/src/main/java/envoy/server/ConnectionManager.java b/src/main/java/envoy/server/ConnectionManager.java
index 2d7aac5..a1b9945 100644
--- a/src/main/java/envoy/server/ConnectionManager.java
+++ b/src/main/java/envoy/server/ConnectionManager.java
@@ -49,13 +49,15 @@ public class ConnectionManager implements ISocketIdListener {
 
 	@Override
 	public void socketCancelled(long socketId) {
-		// notifying contacts of this users offline-going
-		long	clientId	= getUserIdBySocketId(socketId);
-		User	user		= new User(clientId, PersistenceManager.getPersistenceManager().getUserById(clientId).getName());
-		UserStatusChangeProcessor.updateUserStatus(new UserStatusChangeEvent(user));
-		// removing the socket
-		if (!pendingSockets.remove(socketId))
+		if (!pendingSockets.remove(socketId)) {
+			// notifying contacts of this users offline-going
+			long	clientId	= getUserIdBySocketId(socketId);
+			User	user		= new User(clientId, PersistenceManager.getPersistenceManager().getUserById(clientId).getName());
+			UserStatusChangeProcessor.updateUserStatus(new UserStatusChangeEvent(user));
+
+			// removing the socket
 			sockets.entrySet().stream().filter(e -> e.getValue() == socketId).forEach(e -> sockets.remove(e.getValue()));
+		}
 	}
 
 	@Override
diff --git a/src/main/java/envoy/server/database/PersistenceManager.java b/src/main/java/envoy/server/database/PersistenceManager.java
index e7e2a0e..7f2d715 100644
--- a/src/main/java/envoy/server/database/PersistenceManager.java
+++ b/src/main/java/envoy/server/database/PersistenceManager.java
@@ -229,11 +229,11 @@ public class PersistenceManager {
 	 * @since Envoy Server Standalone v0.1-alpha
 	 */
 	public void updateUserStatus(User user, UserStatus status) {
-		if (user.getStatus().equals(status)) {
-			System.out.println("Received an UserStatus for User" + user.getId() + "to update that this user already has");
-			return;
+		if (user.getStatus().equals(status))
+			System.out.println("Received an UserStatusChangeEvent for user " + user.getId() + " to update that this user already has");
+		else {
+			user.setStatus(status);
+			persistenceManager.updateUser(user);
 		}
-		user.setStatus(status);
-		persistenceManager.updateUser(user);
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/envoy/server/processors/LoginCredentialProcessor.java b/src/main/java/envoy/server/processors/LoginCredentialProcessor.java
index cefdec2..636b218 100644
--- a/src/main/java/envoy/server/processors/LoginCredentialProcessor.java
+++ b/src/main/java/envoy/server/processors/LoginCredentialProcessor.java
@@ -44,19 +44,15 @@ public class LoginCredentialProcessor implements ObjectProcessor<LoginCredential
 
 		// Not logged in successfully
 		if (user == null) return;
+		ConnectionManager.getInstance().registerUser(user.getId(), socketId);
+
 		// notifies contacts of this users online-going and updates his status in the
 		// database
 		UserStatusChangeProcessor.updateUserStatus(new UserStatusChangeEvent(user.toCommonUser()));
 
-		ConnectionManager.getInstance().registerUser(user.getId(), socketId);
-
 		// Create contacts
-		List<User>	users		= PersistenceManager.getPersistenceManager()
-			.getContacts(user)
-			.stream()
-			.map(envoy.server.data.User::toCommonUser)
-			.collect(Collectors.toList());
-		Contacts	contacts	= new Contacts(user.getId(), users);
+		Contacts contacts = new Contacts(user.getId(),
+				user.getContacts().stream().map(envoy.server.data.User::toCommonUser).collect(Collectors.toList()));
 
 		// Complete handshake
 		System.out.println("Sending user...");
@@ -83,6 +79,7 @@ public class LoginCredentialProcessor implements ObjectProcessor<LoginCredential
 			user.setLastSeen(new Date());
 			user.setStatus(User.UserStatus.ONLINE);
 			user.setPasswordHash(credentials.getPasswordHash());
+			user.setContacts(PersistenceManager.getPersistenceManager().getContacts(user));
 			persistenceManager.addUser(user);
 		} else {
 			user = persistenceManager.getUserByName(credentials.getName());
diff --git a/src/main/java/envoy/server/processors/UserStatusChangeProcessor.java b/src/main/java/envoy/server/processors/UserStatusChangeProcessor.java
index 30b225a..b682d2e 100644
--- a/src/main/java/envoy/server/processors/UserStatusChangeProcessor.java
+++ b/src/main/java/envoy/server/processors/UserStatusChangeProcessor.java
@@ -72,7 +72,7 @@ public class UserStatusChangeProcessor implements ObjectProcessor<UserStatusChan
 				if (conMan.isOnline(contact.getId())) writeProxy.write(conMan.getSocketId(contact.getId()), evt);
 		} catch (IOException e) {
 			e.printStackTrace();
-			System.err.println("Could not notify online contacts of user" + evt.getId() + "that his status changed");
+			System.err.println("Could not notify online contacts of user " + evt.getId() + " that his status changed");
 		}
 	}