diff --git a/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java b/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java
index 963add233..0310d3df9 100644
--- a/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java
@@ -122,7 +122,7 @@ public abstract class FessSearchAction extends FessBaseAction {
         runtime.registerData("langItems", systemHelper.getLanguageItems(locale));
         runtime.registerData("username", systemHelper.getUsername());
         
-        runtime.registerData("pageLoginLink", systemHelper.getPageLoginLink());
+        runtime.registerData("pageLoginLink", fessConfig.isPageLoginLink());
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
index d8682ccd7..497c8604d 100644
--- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
@@ -288,8 +288,5 @@ public class SystemHelper implements Serializable {
     protected String createSearchRole(final String type, final String name) {
         return type + name;
     }
-    
-    public boolean getPageLoginLink() {
-        return ComponentUtil.getFessConfig().isPageLoginLink();
-    }
+
 }
diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties
index a627e3c0d..bbbdcf8ea 100644
--- a/src/main/resources/fess_config.properties
+++ b/src/main/resources/fess_config.properties
@@ -375,7 +375,7 @@ online.help.name.crawlinginfo=crawlinginfo
 online.help.name.backup=backup
 online.help.name.upgrade=upgrade
 
-online.help.supported.langs=
+online.help.supported.langs=ja
 
 # ----------------------------------------------------------
 #                                                    Suggest
diff --git a/src/main/webapp/WEB-INF/view/header.jsp b/src/main/webapp/WEB-INF/view/header.jsp
index cb8ce6660..eb5cd9c8c 100755
--- a/src/main/webapp/WEB-INF/view/header.jsp
+++ b/src/main/webapp/WEB-INF/view/header.jsp
@@ -8,32 +8,34 @@ ${fe:facetForm()}${fe:geoForm()}
 				alt="<la:message key="labels.header_brand_name" />" />
 		</la:link>
 		<ul class="nav navbar-nav hidden-xs-down">
-			<c:if test="${!empty username && username != 'guest'}">
-				<li class="nav-item username">
-					<div class="dropdown">
-						<a class="nav-link dropdown-toggle" data-toggle="dropdown"
-							href="#" role="button" aria-haspopup="true" aria-expanded="false">
-							<i class="fa fa-user"></i>${username}
-						</a>
-						<div class="dropdown-menu" aria-labelledby="userMenu">
-							<la:link href="/profile" styleClass="dropdown-item">
-								<la:message key="labels.profile" />
-							</la:link>
-							<la:link href="/logout" styleClass="dropdown-item">
-								<la:message key="labels.logout" />
-							</la:link>
+			<c:choose>
+				<c:when test="${!empty username && username != 'guest'}">
+					<li class="nav-item">
+						<div class="dropdown">
+							<a class="nav-link dropdown-toggle" data-toggle="dropdown"
+								href="#" role="button" aria-haspopup="true"
+								aria-expanded="false"> <i class="fa fa-user"></i>${username}
+							</a>
+							<div class="dropdown-menu" aria-labelledby="userMenu">
+								<la:link href="/profile" styleClass="dropdown-item">
+									<la:message key="labels.profile" />
+								</la:link>
+								<la:link href="/logout" styleClass="dropdown-item">
+									<la:message key="labels.logout" />
+								</la:link>
+							</div>
 						</div>
-					</div>
-				</li>
-			</c:if>
-			<c:if test="${ pageLoginLink }">
-				<li class="nav-item username"><la:link href="/login"
-						styleClass="nav-link" role="button" aria-haspopup="true"
-						aria-expanded="false">
-						<i class="fa fa-user"></i>
-						<la:message key="labels.login" />
-					</la:link></li>
-			</c:if>
+					</li>
+				</c:when>
+				<c:when test="${ pageLoginLink }">
+					<li class="nav-item username"><la:link href="/login"
+							styleClass="nav-link" role="button" aria-haspopup="true"
+							aria-expanded="false">
+							<i class="fa fa-user"></i>
+							<la:message key="labels.login" />
+						</la:link></li>
+				</c:when>
+			</c:choose>
 		</ul>
 		<div
 			class="search-box navbar-form col-lg-5 col-md-6 col-sm-6 col-xs-8 pull-right"
diff --git a/src/main/webapp/WEB-INF/view/index.jsp b/src/main/webapp/WEB-INF/view/index.jsp
index b06bc9da9..f45c2ad24 100644
--- a/src/main/webapp/WEB-INF/view/index.jsp
+++ b/src/main/webapp/WEB-INF/view/index.jsp
@@ -21,32 +21,34 @@
 	<nav class="navbar navbar-dark bg-inverse navbar-static-top pos-f-t">
 		<div class="container">
 			<ul class="nav navbar-nav pull-right">
-				<c:if test="${!empty username && username != 'guest'}">
-					<li class="nav-item">
-						<div class="dropdown">
-							<a class="nav-link dropdown-toggle" data-toggle="dropdown"
-								href="#" role="button" aria-haspopup="true"
-								aria-expanded="false"> <i class="fa fa-user"></i>${username}
-							</a>
-							<div class="dropdown-menu" aria-labelledby="userMenu">
-								<la:link href="/profile" styleClass="dropdown-item">
-									<la:message key="labels.profile" />
-								</la:link>
-								<la:link href="/logout" styleClass="dropdown-item">
-									<la:message key="labels.logout" />
-								</la:link>
+				<c:choose>
+					<c:when test="${!empty username && username != 'guest'}">
+						<li class="nav-item">
+							<div class="dropdown">
+								<a class="nav-link dropdown-toggle" data-toggle="dropdown"
+									href="#" role="button" aria-haspopup="true"
+									aria-expanded="false"> <i class="fa fa-user"></i>${username}
+								</a>
+								<div class="dropdown-menu" aria-labelledby="userMenu">
+									<la:link href="/profile" styleClass="dropdown-item">
+										<la:message key="labels.profile" />
+									</la:link>
+									<la:link href="/logout" styleClass="dropdown-item">
+										<la:message key="labels.logout" />
+									</la:link>
+								</div>
 							</div>
-						</div>
-					</li>
-				</c:if>
-				<c:if test="${ pageLoginLink }">
-					<li class="nav-item username"><la:link href="/login"
-							styleClass="nav-link" role="button" aria-haspopup="true"
-							aria-expanded="false">
-							<i class="fa fa-user"></i>
-							<la:message key="labels.login" />
-						</la:link></li>
-				</c:if>
+						</li>
+					</c:when>
+					<c:when test="${ pageLoginLink }">
+						<li class="nav-item username"><la:link href="/login"
+								styleClass="nav-link" role="button" aria-haspopup="true"
+								aria-expanded="false">
+								<i class="fa fa-user"></i>
+								<la:message key="labels.login" />
+							</la:link></li>
+					</c:when>
+				</c:choose>
 				<li class="nav-item"><la:link href="/help"
 						styleClass="nav-link help-link">
 						<i class="fa fa-question-circle"></i>