diff --git a/backend/web/static/base.js b/backend/web/static/base.js
index 4ed4ea06139219217d3c995760b2af5fffa2cd97..1b9cf6bc1c831638dc7cebb17cbbf83430ffcc59 100644
--- a/backend/web/static/base.js
+++ b/backend/web/static/base.js
@@ -370,18 +370,16 @@ function render_messages(data) {
 
 	var html = "";
 	messages.forEach((message) => {
+		var type = message.type;
+		if (type == "error") {
+			type = "danger";
+		}
+		html += "<div class=\"alert alert-" + type + "\">";
 		html += message.text;
-		html += "</br>";
+		html += "</div>";
 	});
 	$("#contentMessages").html(html);
 
-	$("#contentMessages").addClass("alert");
-	if (data.state == "success") {
-		$("#contentMessages").addClass("alert-success");
-	} else {
-		$("#contentMessages").addClass("alert-warning");
-	}
-
 	// Store we shown these messages
 	Cookies.set("last_flow_id_rendered_message", data.id);
 
diff --git a/frontend/src/components/UserModal/UserModal.tsx b/frontend/src/components/UserModal/UserModal.tsx
index 2d8b31ef62ffd016a584bedbdb729b7da5034c68..42d4ccc03ad22812d85710db25aa6d61b45a3361 100644
--- a/frontend/src/components/UserModal/UserModal.tsx
+++ b/frontend/src/components/UserModal/UserModal.tsx
@@ -243,7 +243,7 @@ export const UserModal = ({ open, onClose, userId, setUserId, apps }: UserModalP
           className="mb-4 sm:mb-0 inline-flex items-center px-4 py-2 text-sm
   font-medium rounded-md text-primary-700 bg-primary-100 hover:bg-primary-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-700"
         >
-          Reset 2FA
+          Reset TOTP
           <QrcodeIcon className="-mr-0.5 ml-2 h-4 w-4" aria-hidden="true" />
         </button>
       )