diff --git a/app/admin/layout.tsx b/app/admin/layout.tsx
index 47596d996..f35750652 100644
--- a/app/admin/layout.tsx
+++ b/app/admin/layout.tsx
@@ -28,8 +28,7 @@ export default function SettingsLayout({ children }: SettingsLayoutProps) {
           <GetTranslation text="Administration" />
             </h2>
           <p className="text-muted-foreground" dir={TextDirection}>
-          {/* {TranslationData["Manage your BizGPT instance"]} */}
-          <GetTranslation text="Manage your BizGPT instance" />
+          <GetTranslation text="Manage your system" />
           </p>
         </div>
         <Separator className="my-6" />
diff --git a/app/layout.tsx b/app/layout.tsx
index 846ad2985..c2ae09f7e 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -9,12 +9,14 @@ import { TailwindIndicator } from '@/components/tailwind-indicator'
 import { Providers } from '@/components/providers'
 import { Header } from '@/components/header'
 
+const defaultTabName = process.env.NEXT_PUBLIC_CLIENT_BRANDING_NAME
+
 export const metadata: Metadata = {
   title: {
-    default: 'BizGPT',
-    template: `%s - BizGPT`
+    default: defaultTabName ? defaultTabName : 'BizGPT',
+    template: `%s - ${defaultTabName ? defaultTabName : 'BizGPT'}`
   },
-  description: 'A chatbot powered by BizGPT',
+  description: `A chatbot powered by ${defaultTabName ? defaultTabName : 'BizGPT'}`,
   themeColor: [
     { media: '(prefers-color-scheme: light)', color: 'white' },
     { media: '(prefers-color-scheme: dark)', color: 'black' }
diff --git a/components/empty-screen.tsx b/components/empty-screen.tsx
index 73df14d47..c93d1b26d 100644
--- a/components/empty-screen.tsx
+++ b/components/empty-screen.tsx
@@ -8,7 +8,7 @@ import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 import GlobalConfig from '@/app/app.config.js'
 
 const TextDirection = process.env.TEXT_DIRECTION
-
+const clientFooterName = process.env.NEXT_PUBLIC_CLIENT_BRANDING_NAME ? process.env.NEXT_PUBLIC_CLIENT_BRANDING_NAME : 'BizGPT' 
 
 export function EmptyScreen({ setInput }: Pick<UseChatHelpers, 'setInput'>) {
   
@@ -30,7 +30,7 @@ export function EmptyScreen({ setInput }: Pick<UseChatHelpers, 'setInput'>) {
     <div className="mx-auto max-w-2xl px-4">
       <div className="rounded-lg border bg-background p-8">
         <h1 className="mb-2 text-lg font-semibold" dir={TextDirection}>
-          {TranslationData["Welcome to BizGPT!"] }
+          { `${TranslationData["Welcome to"]} ${clientFooterName}` }
         </h1>
         <p className="leading-normal text-muted-foreground" dir={TextDirection}>
           
diff --git a/components/footer.tsx b/components/footer.tsx
index 20474fcd1..1621e22c1 100644
--- a/components/footer.tsx
+++ b/components/footer.tsx
@@ -5,6 +5,8 @@ import { ExternalLink } from '@/components/external-link'
 import GlobalConfig from '@/app/app.config.js'
 
 const TextDirection = process.env.TEXT_DIRECTION
+const clientFooterName = process.env.NEXT_PUBLIC_CLIENT_BRANDING_NAME ? process.env.NEXT_PUBLIC_CLIENT_BRANDING_NAME : 'BizGPT' 
+
 
 export function FooterText({ className, ...props }: React.ComponentProps<'p'>) {
   // Language and Translation
@@ -19,7 +21,7 @@ export function FooterText({ className, ...props }: React.ComponentProps<'p'>) {
       )}
       {...props}
     >
-      {TranslationData["Made with ❤️ by BizGPT"]}
+      {`${TranslationData["Made with ❤️ by"]} ${clientFooterName}`}
       
     </p>
   )
diff --git a/components/user-menu.tsx b/components/user-menu.tsx
index 8dd4653de..0b9c1fa22 100644
--- a/components/user-menu.tsx
+++ b/components/user-menu.tsx
@@ -40,6 +40,7 @@ export function UserMenu({ user }: UserMenuProps) {
 
   // Language and Translation
   var TranslationData = require(`@/translation/${process.env.BIZGPT_FRONTEND_LANGUAGE}.json`);
+  const clientFooterName = process.env.NEXT_PUBLIC_CLIENT_BRANDING_NAME ? process.env.NEXT_PUBLIC_CLIENT_BRANDING_NAME : 'BizGPT' 
 
   return (
     <div className="flex items-center justify-between">
@@ -76,14 +77,15 @@ export function UserMenu({ user }: UserMenuProps) {
           <DropdownMenuSeparator />
           <DropdownMenuItem asChild>
             <a
-              href="https://bizgpt.info"
+              href={process.env.NEXT_PUBLIC_CLIENT_BRANDING_WEBSITE ? process.env.NEXT_PUBLIC_CLIENT_BRANDING_WEBSITE : 'https://bizgpt.info' }
               target="_blank"
               rel="noopener noreferrer"
               className="inline-flex w-full items-center justify-between text-xs"
               dir={TextDirection}
             >
               
-              {TranslationData["BizGPT Homepage"]}
+              {/* {TranslationData["BizGPT Homepage"]} */}
+              {`${clientFooterName} ${TranslationData["Homepage"]} `}
               <IconExternalLink className="ml-auto h-3 w-3" />
             </a>
           </DropdownMenuItem>
diff --git a/translation/EN.json b/translation/EN.json
index e4d72fcff..e5704d053 100644
--- a/translation/EN.json
+++ b/translation/EN.json
@@ -8,11 +8,11 @@
     "Go Back": "Go Back",
     "Ask Something...": "Ask Something...",
     "Send message": "Send message",
-    "Made with ❤️ by BizGPT": "Made with ❤️ by BizGPT",
-    "BizGPT Homepage": "BizGPT Homepage",
+    "Made with ❤️ by": "Made with ❤️ by",
+    "Homepage": "Homepage",
     "Logout": "Logout",
     "Administration": "Administration",
-    "Manage your BizGPT instance": "Manage your BizGPT instance",
+    "Manage your system": "Manage your system",
     "Knowledgebase": "Knowledgebase",
     "Upload": "Upload",
     "Details": "Details",
@@ -71,7 +71,7 @@
     "No bookmarks yet!": "No bookmarks yet!",
     "You can start by bookmarking some question-answers.": "You can start by bookmarking some question-answers.",
     "Bookmarks": "Bookmarks",
-    "Welcome to BizGPT!": "Welcome to BizGPT!",
+    "Welcome to": "Welcome to",
     "You can start a conversation by asking something or try the following examples:": "You can start a conversation by asking something or try the following examples:",
     "Check your inbox!": "Check your inbox!",
     "Password reset successfully. You could go back using the button.": "Password reset successfully. You could go back using the button.",
diff --git a/translation/FA.json b/translation/FA.json
index ff3ab73e1..4fe0b031d 100644
--- a/translation/FA.json
+++ b/translation/FA.json
@@ -8,11 +8,11 @@
     "Go Back": "بازگشت",
     "Ask Something...": "یک سوال بپرسید...",
     "Send message": "ارسال",
-    "Made with ❤️ by BizGPT": "تهیه شده توسط BizGPT",
-    "BizGPT Homepage": "سایت BizGPT",
+    "Made with ❤️ by": "تهیه شده توسط ",
+    "Homepage": "سایت",
     "Logout" : "خروج",
     "Administration": "بخش مدیریت",
-    "Manage your BizGPT instance": "به وسیله این پنل سیستم BizGPT خود را مدیریت کنید",
+    "Manage your system": "به وسیله این پنل سیستم خود را مدیریت کنید",
     "Knowledgebase": "مخزن دانش",
     "Upload": "بارگذاری",
     "Details": "جزئیات",
@@ -71,7 +71,7 @@
     "No bookmarks yet!": "هیچ نشانکی یافت نشد!",
     "You can start by bookmarking some question-answers.": "برای شروع چند پرسش-پاسخ را نشانک‌گذاری کنید.",
     "Bookmarks": "نشانک‌ها",
-    "Welcome to BizGPT!": "به BizGPT خوش آمدید!",
+    "Welcome to": "خوش آمدید به",
     "You can start a conversation by asking something or try the following examples:" : "با پرسیدن یک سوال و یا استفاده از مثال‌های زیر، مکالمه خود با هوش مصنوعی را هم‌اکنون آغاز کنید:",
     "Check your inbox!": "لطفا ایمیل خود را چک کنید",
     "Password reset successfully. You could go back using the button.": "گذرواژه با موفقیت تغییر کرد. با استفاده از دکمه بازگشت به صفحه قبل بازگردید.",
diff --git a/translation/FR.json b/translation/FR.json
index 3fdb37094..6cc964156 100644
--- a/translation/FR.json
+++ b/translation/FR.json
@@ -8,11 +8,11 @@
   "Go Back": "Revenir en arrière",
   "Ask Something...": "Poser une question...",
   "Send message": "Envoyer le message",
-  "Made with ❤️ by BizGPT": "Réalisé avec ❤️ par BizGPT",
-  "BizGPT Homepage": "BizGPT Page d'accueil",
+  "Made with ❤️ by": "Réalisé avec ❤️ par",
+  "Homepage": "Page d'accueil",
   "Logout": "Logout",
   "Administration": "Administration",
-  "Manage your BizGPT instance": "Gérez votre instance BizGPT",
+  "Manage your system": "Gérez votre system",
   "Knowledgebase": "Base de connaissances",
   "Upload": "Télécharger",
   "Details": "Détails",
@@ -71,7 +71,7 @@
   "No bookmarks yet!": "Aucun signet pour le moment !",
   "You can start by bookmarking some question-answers.": "Vous pouvez commencer par mettre en signet certaines questions-réponses.",
   "Bookmarks": "Signets",
-  "Welcome to BizGPT!": "Bienvenue sur BizGPT !",
+  "Welcome to": "Bienvenue sur",
   "You can start a conversation by asking something or try the following examples:": "Vous pouvez commencer une conversation en posant une question ou essayer les exemples suivants :",
   "Check your inbox!": "Consultez votre boîte de réception !",
   "Password reset successfully. You could go back using the button.": "Réinitialisation du mot de passe réussie. Vous pouvez revenir en arrière en utilisant le bouton.",