diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
index 07023553b..300f4340f 100644
--- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
@@ -121,11 +121,9 @@ public class SystemHelper implements Serializable {
     }
 
     public String getUsername() {
-        String username = LaRequestUtil.getRequest().getRemoteUser();
-        if (StringUtil.isBlank(username)) {
-            username = "guest";
-        }
-        return username;
+        return ComponentUtil.getLoginAssist().getSessionUserBean().map(user -> {
+            return user.getUserId();
+        }).orElse(Constants.GUEST_USER);
     }
 
     public LocalDateTime getCurrentTime() {
diff --git a/src/main/java/org/codelibs/fess/util/ComponentUtil.java b/src/main/java/org/codelibs/fess/util/ComponentUtil.java
index c2f5b43e7..b48650b94 100644
--- a/src/main/java/org/codelibs/fess/util/ComponentUtil.java
+++ b/src/main/java/org/codelibs/fess/util/ComponentUtil.java
@@ -19,6 +19,7 @@ package org.codelibs.fess.util;
 import org.codelibs.core.crypto.CachedCipher;
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.fess.api.WebApiManagerFactory;
+import org.codelibs.fess.app.web.base.login.FessLoginAssist;
 import org.codelibs.fess.client.FessEsClient;
 import org.codelibs.fess.ds.DataStoreFactory;
 import org.codelibs.fess.helper.AdRoleHelper;
@@ -250,6 +251,10 @@ public final class ComponentUtil {
         return SingletonLaContainer.getComponent(DATA_SERVICE);
     }
 
+    public static FessLoginAssist getLoginAssist() {
+        return getComponent(FessLoginAssist.class);
+    }
+
     public static <T> T getComponent(final Class<T> clazz) {
         return SingletonLaContainer.getComponent(clazz);
     }