diff --git a/client/src/main/java/envoy/client/data/ClientConfig.java b/client/src/main/java/envoy/client/data/ClientConfig.java
index f0789e2..613b970 100644
--- a/client/src/main/java/envoy/client/data/ClientConfig.java
+++ b/client/src/main/java/envoy/client/data/ClientConfig.java
@@ -2,8 +2,6 @@ package envoy.client.data;
 
 import static java.util.function.Function.identity;
 
-import java.io.File;
-
 import envoy.data.Config;
 
 /**
@@ -34,7 +32,6 @@ public final class ClientConfig extends Config {
 		super(".envoy");
 		put("server", "s", identity());
 		put("port", "p", Integer::parseInt);
-		put("localDB", "db", File::new);
 		put("localDBSaveInterval", "db-si", Integer::parseInt);
 	}
 
@@ -50,12 +47,6 @@ public final class ClientConfig extends Config {
 	 */
 	public Integer getPort() { return (Integer) items.get("port").get(); }
 
-	/**
-	 * @return the local database specific to the client user
-	 * @since Envoy Client v0.1-alpha
-	 */
-	public File getLocalDB() { return (File) items.get("localDB").get(); }
-
 	/**
 	 * @return the amount of minutes after which the local database should be saved
 	 * @since Envoy Client v0.2-beta
diff --git a/client/src/main/java/envoy/client/ui/Startup.java b/client/src/main/java/envoy/client/ui/Startup.java
index 012cc00..2e6b5d2 100644
--- a/client/src/main/java/envoy/client/ui/Startup.java
+++ b/client/src/main/java/envoy/client/ui/Startup.java
@@ -70,9 +70,9 @@ public final class Startup extends Application {
 
 		// Initialize the local database
 		try {
-			final var localDBDir = new File(config.getHomeDirectory(), config.getLocalDB().getPath());
-			logger.info("Initializing LocalDB at " + localDBDir);
-			localDB = new LocalDB(localDBDir);
+			var localDBFile = new File(config.getHomeDirectory(), config.getServer());
+			logger.info("Initializing LocalDB at " + localDBFile);
+			localDB = new LocalDB(localDBFile);
 		} catch (IOException | EnvoyException e) {
 			logger.log(Level.SEVERE, "Could not initialize local database: ", e);
 			new Alert(AlertType.ERROR, "Could not initialize local database!\n" + e).showAndWait();
diff --git a/client/src/main/java/envoy/client/ui/controller/GroupCreationTab.java b/client/src/main/java/envoy/client/ui/controller/GroupCreationTab.java
index d0e1c50..d2f61a6 100644
--- a/client/src/main/java/envoy/client/ui/controller/GroupCreationTab.java
+++ b/client/src/main/java/envoy/client/ui/controller/GroupCreationTab.java
@@ -205,13 +205,15 @@ public class GroupCreationTab implements EventListener {
 
 	@Event
 	private void onContactOperation(ContactOperation operation) {
-		switch (operation.getOperationType()) {
-			case ADD:
-				if (operation.get() instanceof User) Platform.runLater(() -> userList.getItems().add((User) operation.get()));
-				break;
-			case REMOVE:
-				Platform.runLater(() -> userList.getItems().removeIf(u -> u.equals(operation.get())));
-				break;
-		}
+		if (operation.get() instanceof User) Platform.runLater(() -> {
+			switch (operation.getOperationType()) {
+				case ADD:
+					userList.getItems().add((User) operation.get());
+					break;
+				case REMOVE:
+					userList.getItems().removeIf(u -> u.equals(operation.get()));
+					break;
+			}
+		});
 	}
 }