diff --git a/themes/openwrt/htdocs/luci-static/openwrt.org/cascade.css b/themes/openwrt/htdocs/luci-static/openwrt.org/cascade.css
index 8fb5fcbb06..272939373e 100644
--- a/themes/openwrt/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/openwrt/htdocs/luci-static/openwrt.org/cascade.css
@@ -803,6 +803,11 @@ div.cbi-tab-descr {
 	margin-bottom: 5px;
 }
 
+.errorbox a {
+	color: #000000 !important;
+}
+
+
 .uci-change-list {
 	font-family: monospace;
 }
diff --git a/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm b/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm
index ea9ce02f27..19f061443a 100644
--- a/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm
@@ -195,6 +195,7 @@ if tree.nodes[category] and tree.nodes[category].ucidata then
 		<%- if luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
 		<div class="errorbox">
 			<strong><%:No password set!%></strong><br />
-			<%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%>
+			<%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%><br />
+			<a href="<%=pcdata(luci.dispatcher.build_url("admin/system/admin"))%>"><%:Go to password configuration...%></a>
 		</div>
 		<%- end -%>