diff --git a/modules/admin-core/luasrc/view/error500.htm b/modules/admin-core/luasrc/view/error500.htm
index 829e19688b..8f3807d80e 100644
--- a/modules/admin-core/luasrc/view/error500.htm
+++ b/modules/admin-core/luasrc/view/error500.htm
@@ -15,5 +15,5 @@ $Id$
 <%+header%>
 <h1>500 Internal Server Error</h1>
 <p>Sorry, the server encountered an unexpected error.</p>
-<tt><%=message%></tt>
-<%+footer%>
\ No newline at end of file
+<pre class="error500"><%=message%></pre>
+<%+footer%>
diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
index d022655140..78cb9542a3 100644
--- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
@@ -419,6 +419,12 @@ td.cbi-section-table-optionals {
 	padding-top: 1em;
 }
 
+div.cbi-error {
+	font-size: 95%;
+	font-weight: bold;
+	color: #FF0000;
+}
+
 .right {
 	text-align: right;
 }
@@ -440,6 +446,13 @@ td.cbi-section-table-optionals {
 	display: inline;
 }
 
+.error500 {
+	white-space: normal;
+	border: 1px dotted #FF0000;
+	background-color: #FFFFFF;
+	padding: 0.5em;
+}
+
 #memorybar {
 	width:200px;
 	height:8px;