diff --git a/modules/luci-base/luasrc/view/cbi/map.htm b/modules/luci-base/luasrc/view/cbi/map.htm
index 69ef3615a2..02b47f5455 100644
--- a/modules/luci-base/luasrc/view/cbi/map.htm
+++ b/modules/luci-base/luasrc/view/cbi/map.htm
@@ -1,5 +1,5 @@
 <%- if firstmap and messages then local msg; for _, msg in ipairs(messages) do -%>
-	<div class="errorbox"><%=pcdata(msg)%></div>
+	<div class="alert-message warning"><%=pcdata(msg)%></div>
 <%- end end -%>
 
 <div class="cbi-map" id="cbi-<%=self.config%>">
diff --git a/modules/luci-base/luasrc/view/sysauth.htm b/modules/luci-base/luasrc/view/sysauth.htm
index b3ec9b7617..e7a741aaab 100644
--- a/modules/luci-base/luasrc/view/sysauth.htm
+++ b/modules/luci-base/luasrc/view/sysauth.htm
@@ -8,7 +8,9 @@
 
 <form method="post" action="<%=pcdata(FULL_REQUEST_URI)%>">
 	<%- if fuser then %>
-	<div class="errorbox"><%:Invalid username and/or password! Please try again.%></div>
+		<div class="alert-message warning">
+			<p><%:Invalid username and/or password! Please try again.%></p>
+		</div>
 	<% end -%>
 
 	<div class="cbi-map">