diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
index 349ad3b9f..cc6da7214 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
@@ -236,7 +236,11 @@ public class UnlockController implements ViewController {
 		} else {
 			useCustomMountPoint.setVisible(true);
 			useCustomMountPoint.setSelected(vaultSettings.usesIndividualMountPath().get());
-			customMountPointLabel.setText(vaultSettings.getIndividualMountPath().orElse(localization.getString("unlock.label.chooseMountPath")));
+			if (Strings.isNullOrEmpty(vaultSettings.individualMountPath().get())) {
+				customMountPointLabel.setText(localization.getString("unlock.label.chooseMountPath"));
+			} else {
+				customMountPointLabel.setText(displayablePath(vaultSettings.individualMountPath().getValueSafe()));
+			}
 		}
 
 		// DOKANY-dependent controls: