diff --git a/frontend/static/js/views/SettingsView.js b/frontend/static/js/views/SettingsView.js
index 21d389c..04d0141 100644
--- a/frontend/static/js/views/SettingsView.js
+++ b/frontend/static/js/views/SettingsView.js
@@ -88,12 +88,22 @@ export default class extends AbstractAuthenticatedView
 							newPassword2Detail,
 							passwordDetail
 		]);
-		if (!currentPassword.length)
+		currentPasswordInput.classList.remove('is-invalid');
+		newPasswordInput.classList.remove('is-invalid');
+		newPassword2Input.classList.remove('is-invalid');
+
+		if (!currentPassword.length) {
 			currentPasswordDetail.innerHTML = lang.get('errorEmptyField');
-		if (!newPassword.length)
+			currentPasswordInput.classList.add('is-invalid');
+		}
+		if (!newPassword.length) {
 			newPasswordDetail.innerHTML = lang.get('errorEmptyField');
-		if (!newPassword2.length)
+			newPasswordInput.classList.add('is-invalid');
+		}
+		if (!newPassword2.length) {
 			newPassword2Detail.innerHTML = lang.get('errorEmptyField');
+			newPassword2Input.classList.add('is-invalid');
+		}
 		if (!currentPassword.length || !newPassword.length || !newPassword2.length)
 			return;
 
@@ -108,6 +118,12 @@ export default class extends AbstractAuthenticatedView
 			passwordDetail.classList.add('text-danger');
 			passwordDetail.classList.remove('text-success');
 			fill_errors(error, 'innerHTML');
+			if (error.currentPasswordDetail)
+				currentPasswordInput.classList.add('is-invalid');
+			if (error.newPasswordDetail)
+				newPasswordInput.classList.add('is-invalid');
+			if (error.newPassword2Detail)
+				newPassword2Input.classList.add('is-invalid');
 		}
 	}