diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
index 106529d0d..7ae84eb10 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
@@ -48,7 +48,7 @@
           <b-col>
             <div class="text-right" ref="submitButton">
               <b-button
-                :variant="loading ? 'default' : 'success'"
+                :variant="loading ? 'light' : 'success'"
                 @click="onSubmit"
                 type="submit"
                 class="mt-4"
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
index e67304e02..5d63e9832 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
@@ -31,7 +31,12 @@
           <b-row class="text-right">
             <b-col>
               <div class="text-right">
-                <b-button type="submit" variant="primary" class="mt-4">
+                <b-button
+                  type="submit"
+                  :variant="disabled ? 'light' : 'success'"
+                  class="mt-4"
+                  :disabled="disabled"
+                >
                   {{ $t('form.save') }}
                 </b-button>
               </div>
@@ -92,6 +97,14 @@ export default {
         })
     },
   },
+  computed: {
+    disabled() {
+      return !(
+        this.form.newPassword.password !== '' &&
+        this.form.newPassword.password === this.form.newPassword.passwordRepeat
+      )
+    },
+  },
 }
 </script>
 <style>
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Language.vue b/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
index a7b9d7f70..0c363f2fe 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
@@ -44,7 +44,7 @@
             <b-col>
               <div class="text-right" ref="submitButton">
                 <b-button
-                  :variant="loading ? 'default' : 'success'"
+                  :variant="loading ? 'light' : 'success'"
                   type="submit"
                   class="mt-4"
                   :disabled="loading"