diff --git a/app.py b/app.py
index d134e12d1..852710ca8 100644
--- a/app.py
+++ b/app.py
@@ -177,6 +177,7 @@ FILTERED_VALUES = [
     {"key": ["upstream_registry_password"], "fn": DEFAULT_FILTER},
     {"key": ["upstream_registry_username"], "fn": DEFAULT_FILTER},
     {"key": ["user", "password"], "fn": DEFAULT_FILTER},
+    {"key": ["user", "repeatPassword"], "fn": DEFAULT_FILTER},
     {"key": ["blob"], "fn": lambda x: x[0:8]},
 ]
 
diff --git a/util/test/test_log_util.py b/util/test/test_log_util.py
index d5c71a73b..0527b9444 100644
--- a/util/test/test_log_util.py
+++ b/util/test/test_log_util.py
@@ -9,12 +9,22 @@ from util.log import filter_logs, logfile_path
 
 def test_filter_logs():
     values = {
-        "user": {"password": "toto"},
+        "user": {"password": "toto", "repeatPassword": "toto"},
+        "password": "toto",
+        "upstream_registry_username": "user",
+        "upstream_registry_password": "testpass",
         "blob": "1234567890asdfewkqresfdsfewfdsfd",
         "unfiltered": "foo",
     }
     filter_logs(values, FILTERED_VALUES)
-    assert values == {"user": {"password": "[FILTERED]"}, "blob": "12345678", "unfiltered": "foo"}
+    assert values == {
+        "user": {"password": "[FILTERED]", "repeatPassword": "[FILTERED]"},
+        "password": "[FILTERED]",
+        "upstream_registry_username": "[FILTERED]",
+        "upstream_registry_password": "[FILTERED]",
+        "blob": "12345678",
+        "unfiltered": "foo",
+    }
 
 
 @pytest.mark.parametrize(