diff --git a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
index 4241af888..761ff6640 100644
--- a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
+++ b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
@@ -34,13 +34,19 @@
 <c:set var="text">
   <jsp:doBody/>
 </c:set>
-<a href="${url}">
-<c:choose>
+<c:choose>
   <c:when test="${currentUrl == url}">
-    <b>${text}</b>
+    <b>
+
+    ${text}
+
+    </b>
   </c:when>
   <c:otherwise>
+    <a href="${url}">
+
     ${text}
-  </c:otherwise>
-</c:choose>
-</a>
+
+    </a>
+  </c:otherwise>
+</c:choose>