diff --git a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
index d711f9069..607e408f3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
@@ -14,6 +14,7 @@ import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptofs.CryptoFileSystemProvider;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
+import org.cryptomator.ui.common.Animations;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.controls.FontAwesome5IconView;
 import org.cryptomator.ui.controls.NiceSecurePasswordField;
@@ -71,8 +72,9 @@ public class ChangePasswordController implements FxController {
 			LOG.error("IO error occured during password change. Unable to perform operation.", e);
 			e.printStackTrace();
 		} catch (InvalidPassphraseException e) {
-			// TODO shake
-			LOG.info("Wrong old password.");
+			Animations.createShakeWindowAnimation(window).play();
+			oldPasswordField.selectAll();
+			oldPasswordField.requestFocus();
 		}
 	}
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FxControllerKey.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxControllerKey.java
index d4f87c60b..1daf5bc30 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/FxControllerKey.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxControllerKey.java
@@ -14,7 +14,6 @@ import java.lang.annotation.Target;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-// TODO rename after refactoring
 @Documented
 @Target(METHOD)
 @Retention(RUNTIME)
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel.java
index 44f446f47..c99cc62ea 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel.java
@@ -12,7 +12,7 @@ public class FormattedLabel extends Label {
 
 	private final StringProperty format = new SimpleStringProperty("");
 	private final ObjectProperty<Object> arg1 = new SimpleObjectProperty<>();
-	// TODO: add arg2, arg3, ... on demand
+	// add arg2, arg3, ... on demand
 
 	public FormattedLabel() {
 		textProperty().bind(createStringBinding());
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
index 7bda40364..ac21626c5 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
@@ -67,7 +67,7 @@ public class RecoveryKeyResetPasswordController implements FxController {
 		});
 		task.setOnFailed(event -> {
 			// TODO show generic error screen
-			LOG.error("Creation of recovery key failed.", task.getException());
+			LOG.error("Resetting password failed.", task.getException());
 		});
 		executor.submit(task);
 	}