diff --git a/shell/app/common/components/user-info/index.tsx b/shell/app/common/components/user-info/index.tsx
index 4df69d36ac..a2ffd85c6f 100644
--- a/shell/app/common/components/user-info/index.tsx
+++ b/shell/app/common/components/user-info/index.tsx
@@ -17,6 +17,7 @@ import { get } from 'lodash';
 import i18n from 'i18n';
 import { Avatar } from 'antd';
 import { getAvatarChars } from 'common/utils';
+import userStore from 'user/stores';
 import Ellipsis from 'common/components/ellipsis';
 import { AvatarSize } from 'antd/lib/avatar/SizeContext';
 
@@ -24,7 +25,7 @@ interface IPlatformUser {
   avatar: string;
   email: string;
   id: string;
-  locked: boolean;
+  locked?: boolean;
   name: string;
   nick: string;
   phone: string;
@@ -37,13 +38,14 @@ interface IProps {
   render?: (data: IPlatformUser, id?: string | number) => React.ReactNode;
 }
 
-const defaultRender = (data: IPlatformUser, id: string | number) => {
+const defaultRender = (data: IPlatformUser, id?: string | number) => {
   return data.nick || data.name || id || i18n.t('None');
 };
 
 const UserInfo = ({ id, render = defaultRender }: IProps) => {
   const userMap = useUserMap();
-  const userInfo: IPlatformUser = get(userMap, id, {});
+  const loginUser = userStore.useStore((s) => s.loginUser);
+  const userInfo = get({ [loginUser.id]: loginUser as unknown as IPlatformUser, ...userMap }, id, {}) as IPlatformUser;
   return <>{render?.(userInfo, id)}</>;
 };
 
diff --git a/shell/app/layout/pages/page-container/page-container.scss b/shell/app/layout/pages/page-container/page-container.scss
index e6183f4931..baf1325ff0 100644
--- a/shell/app/layout/pages/page-container/page-container.scss
+++ b/shell/app/layout/pages/page-container/page-container.scss
@@ -16,7 +16,7 @@
   top: 48px;
   z-index: 2;
   transition: box-shadow 0.1s ease-in-out;
-  &.show {
-    box-shadow: 0 6px 11px -11px $color-default-3 inset;
-  }
+  // &.show {
+  //   box-shadow: 0 6px 11px -11px $color-default-3 inset;
+  // }
 }