diff --git a/src/App.vue b/src/App.vue
index ae338d1..b39f84d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,20 +3,26 @@ import { computed } from 'vue';
 import type { WatermarkProps } from 'element-plus';
 import { useAppStore } from './store/modules/app';
 import { useThemeStore } from './store/modules/theme';
+import { useAuthStore } from './store/modules/auth';
 import { UILocales } from './locales/ui';
 
 defineOptions({ name: 'App' });
 
 const appStore = useAppStore();
 const themeStore = useThemeStore();
-
+const authStore = useAuthStore();
 const locale = computed(() => {
   return UILocales[appStore.locale];
 });
 
 const watermarkProps = computed<WatermarkProps>(() => {
+  const content =
+    themeStore.watermark.enableUserName && authStore.userInfo.userName
+      ? authStore.userInfo.userName
+      : themeStore.watermark.text;
+
   return {
-    content: themeStore.watermark.visible ? themeStore.watermark.text || 'SoybeanAdmin' : '',
+    content: themeStore.watermark.visible ? content : '',
     cross: true,
     fontSize: 16,
     lineHeight: 16,
diff --git a/src/layouts/modules/theme-drawer/modules/page-fun.vue b/src/layouts/modules/theme-drawer/modules/page-fun.vue
index 886b464..d0bb8d0 100644
--- a/src/layouts/modules/theme-drawer/modules/page-fun.vue
+++ b/src/layouts/modules/theme-drawer/modules/page-fun.vue
@@ -123,7 +123,10 @@ const isWrapperScrollMode = computed(() => themeStore.layout.scrollMode === 'wra
     <SettingItem key="8" :label="$t('theme.watermark.visible')">
       <ElSwitch v-model="themeStore.watermark.visible" />
     </SettingItem>
-    <SettingItem v-if="themeStore.watermark.visible" key="8-1" :label="$t('theme.watermark.text')">
+    <SettingItem v-if="themeStore.watermark.visible" key="8-1" :label="$t('theme.watermark.enableUserName')">
+      <ElSwitch v-model="themeStore.watermark.enableUserName" />
+    </SettingItem>
+    <SettingItem v-if="themeStore.watermark.visible" key="8-2" :label="$t('theme.watermark.text')">
       <ElInput
         v-model="themeStore.watermark.text"
         autosize
diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index 7fda8a0..4594bbe 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -143,7 +143,8 @@ const local: App.I18n.Schema = {
     },
     watermark: {
       visible: 'Watermark Full Screen Visible',
-      text: 'Watermark Text'
+      text: 'Watermark Text',
+      enableUserName: 'Enable User Name Watermark'
     },
     themeDrawerTitle: 'Theme Configuration',
     pageFunTitle: 'Page Function',
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index 3bba13c..68cdd71 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -143,7 +143,8 @@ const local: App.I18n.Schema = {
     },
     watermark: {
       visible: '显示全屏水印',
-      text: '水印文本'
+      text: '水印文本',
+      enableUserName: '启用用户名水印'
     },
     themeDrawerTitle: '主题配置',
     pageFunTitle: '页面功能',
diff --git a/src/theme/settings.ts b/src/theme/settings.ts
index 63c2cb2..0083563 100644
--- a/src/theme/settings.ts
+++ b/src/theme/settings.ts
@@ -58,7 +58,8 @@ export const themeSettings: App.Theme.ThemeSetting = {
   },
   watermark: {
     visible: false,
-    text: 'SoybeanAdmin'
+    text: 'SoybeanAdmin',
+    enableUserName: false
   },
   tokens: {
     light: {
diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts
index 30cb477..b17967e 100644
--- a/src/typings/app.d.ts
+++ b/src/typings/app.d.ts
@@ -113,6 +113,8 @@ declare namespace App {
         visible: boolean;
         /** Watermark text */
         text: string;
+        /** Whether to use user name as watermark text */
+        enableUserName: boolean;
       };
       /** define some theme settings tokens, will transform to css variables */
       tokens: {
@@ -403,6 +405,7 @@ declare namespace App {
         watermark: {
           visible: string;
           text: string;
+          enableUserName: string;
         };
         themeDrawerTitle: string;
         pageFunTitle: string;
diff --git a/src/typings/vite-env.d.ts b/src/typings/vite-env.d.ts
index c90fb2c..c94bbc7 100644
--- a/src/typings/vite-env.d.ts
+++ b/src/typings/vite-env.d.ts
@@ -25,7 +25,7 @@ declare namespace Env {
      *
      * This prefix is start with the icon prefix
      */
-    readonly VITE_ICON_LOCAL_PREFIX: 'local-icon';
+    readonly VITE_ICON_LOCAL_PREFIX: 'icon-local';
     /** backend service base url */
     readonly VITE_SERVICE_BASE_URL: string;
     /**