diff --git a/webapp/components/Password/Change.vue b/webapp/components/Password/Change.vue
index 833f51927..f69a8225b 100644
--- a/webapp/components/Password/Change.vue
+++ b/webapp/components/Password/Change.vue
@@ -48,9 +48,24 @@ export default {
         confirmPassword: ''
       },
       formSchema: {
-        oldPassword: { required: true },
-        newPassword: { required: true },
-        confirmPassword: { required: true }
+        oldPassword: {
+          required: true,
+          message: this.$t(
+            'settings.security.change-password.message-old-password-required'
+          )
+        },
+        newPassword: {
+          required: true,
+          message: this.$t(
+            'settings.security.change-password.message-new-password-required'
+          )
+        },
+        confirmPassword: {
+          required: true,
+          message: this.$t(
+            'settings.security.change-password.message-new-password-confirm-required'
+          )
+        }
       },
       loading: false,
       disabled: true
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index d6cafe6a7..8fa91fb0f 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -46,7 +46,10 @@
         "success": "Passwort erfolgreich geändert!",
         "label-old-password": "Dein altes Passwort",
         "label-new-password": "Dein neues Passwort",
-        "label-new-password-confirm": "Bestätige Dein neues Passwort"
+        "label-new-password-confirm": "Bestätige Dein neues Passwort",
+        "message-old-password-required": "Gebe dein altes Passwort ein",
+        "message-new-password-required": "Gebe ein neues Passwort ein",
+        "message-new-password-confirm-required": "Bestätige dein neues Passwort"
       }
     },
     "invites": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index d265b4c64..5c8583085 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -46,7 +46,10 @@
         "success": "Password successfully changed!",
         "label-old-password": "Your old password",
         "label-new-password": "Your new password",
-        "label-new-password-confirm": "Confirm new password"
+        "label-new-password-confirm": "Confirm new password",
+        "message-old-password-required": "Enter your old password",
+        "message-new-password-required": "Enter a new password",
+        "message-new-password-confirm-required": "Confirm your new password"
       }
     },
     "invites": {