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 f8de0501c..feda4a833 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
@@ -216,6 +216,7 @@ public class UnlockController extends AbstractFXMLViewController {
 	public void setVault(Vault vault) {
 		this.vault = vault;
 		this.mountName.setText(vault.getMountName());
+		this.passwordField.clear();
 	}
 
 	public UnlockListener getListener() {