--- a/web/WEB-INF/dynamic_fragments/language.jsp	Tue Dec 26 19:18:32 2017 +0100
+++ b/web/WEB-INF/dynamic_fragments/language.jsp	Tue Dec 26 19:45:31 2017 +0100
@@ -31,16 +31,17 @@
 
 <c:set scope="page" var="currentLanguage" value="${sessionScope[Constants.SESSION_ATTR_LANGUAGE]}" />
 
-<fmt:bundle basename="${requestScope[Constants.REQ_ATTR_MODULE_INFO].bundleBaseName}">
 <form method="POST"id="lang-selector">
     <c:forEach items="${languages}" var="l">
         <label>
             <input type="radio" name="language" value="${l.language}"
                    <c:if test="${l.language eq currentLanguage.language}">checked</c:if>/>
             ${l.displayLanguage}
-            (${l.getDisplayLanguage(currentLanguage)}<c:if test="${not empty browserLanguage and l.language eq browserLanguage.language}">&nbsp;-&nbsp;<fmt:message key="browserLanguage"/></c:if>)
+            (${l.getDisplayLanguage(currentLanguage)}<c:if test="${not empty browserLanguage and l.language eq browserLanguage.language}"><c:set var="browserLanguagePresent" value="true"/>&nbsp;-&nbsp;<fmt:message key="browserLanguage"/></c:if>)
         </label>
     </c:forEach>
+    <c:if test="${not browserLanguagePresent}">
+        <span class="blNA"><fmt:message key="browserLanguageNotAvailable" /></span>
+    </c:if>
     <input type="submit" value="<fmt:message key="submit" />"/>
 </form>
-</fmt:bundle>