diff --git a/web/app/components/plugins/plugin-auth/authorize/add-oauth-button.tsx b/web/app/components/plugins/plugin-auth/authorize/add-oauth-button.tsx
index c2a252969e..1372a3a5a8 100644
--- a/web/app/components/plugins/plugin-auth/authorize/add-oauth-button.tsx
+++ b/web/app/components/plugins/plugin-auth/authorize/add-oauth-button.tsx
@@ -75,20 +75,21 @@ const AddOAuthButton = ({
 
   const renderCustomLabel = useCallback((item: FormSchema) => {
     return (
-      <div>
+      <div className='w-full'>
         <div className='mb-4 flex rounded-xl bg-background-section-burn p-4'>
           <div className='mr-3 flex h-9 w-9 shrink-0 items-center justify-center rounded-lg border-[0.5px] border-components-card-border bg-components-card-bg shadow-lg'>
             <RiInformation2Fill className='h-5 w-5 text-text-accent' />
           </div>
-          <div className='grow'>
-            <div className='system-sm-regular mb-2'>
+          <div className='w-0 grow'>
+            <div className='system-sm-regular mb-1.5'>
               {t('plugin.auth.clientInfo')}
             </div>
             {
               redirect_uri && (
-                <div className='system-sm-medium flex items-center'>
-                  {redirect_uri}
+                <div className='system-sm-medium flex w-full py-0.5'>
+                  <div className='w-0 grow break-words'>{redirect_uri}</div>
                   <ActionButton
+                    className='shrink-0'
                     onClick={() => {
                       navigator.clipboard.writeText(redirect_uri || '')
                     }}
@@ -167,14 +168,16 @@ const AddOAuthButton = ({
               buttonLeftClassName,
             )}>
               {buttonText}
+              {
+                is_oauth_custom_client_enabled && (
+                  <Badge
+                    className='ml-1 border-text-primary-on-surface bg-components-badge-bg-dimm text-text-primary-on-surface'
+                  >
+                    {t('plugin.auth.custom')}
+                  </Badge>
+                )
+              }
             </div>
-            {
-              is_oauth_custom_client_enabled && (
-                <Badge>
-                  {t('plugin.auth.custom')}
-                </Badge>
-              )
-            }
             <div className={cn(
               'h-4 w-[1px] bg-text-primary-on-surface opacity-[0.15]',
               dividerClassName,
diff --git a/web/app/components/plugins/plugin-auth/authorize/oauth-client-settings.tsx b/web/app/components/plugins/plugin-auth/authorize/oauth-client-settings.tsx
index 8a844d0de8..aa9722a1c5 100644
--- a/web/app/components/plugins/plugin-auth/authorize/oauth-client-settings.tsx
+++ b/web/app/components/plugins/plugin-auth/authorize/oauth-client-settings.tsx
@@ -65,7 +65,7 @@ const OAuthClientSettings = ({
 
     await setPluginOAuthCustomClient({
       client_params: transformedValues,
-      enable_oauth_custom_client: true,
+      enable_oauth_custom_client: __oauth_client__ === 'custom',
     })
     notify({
       type: 'success',
diff --git a/web/service/use-plugins-auth.ts b/web/service/use-plugins-auth.ts
index 05364ad688..7c72455a53 100644
--- a/web/service/use-plugins-auth.ts
+++ b/web/service/use-plugins-auth.ts
@@ -127,6 +127,7 @@ export const useGetPluginOAuthClientSchema = (
       client_params?: Record<string, any>
       redirect_uri?: string
     }>(url),
+    staleTime: 0,
   })
 }