diff --git a/client/components/modals/podcast/tabs/EpisodeDetails.vue b/client/components/modals/podcast/tabs/EpisodeDetails.vue
index d7130eba..720e1f75 100644
--- a/client/components/modals/podcast/tabs/EpisodeDetails.vue
+++ b/client/components/modals/podcast/tabs/EpisodeDetails.vue
@@ -19,7 +19,7 @@
       <div class="w-full p-1">
         <ui-textarea-with-label v-model="newEpisode.subtitle" :label="$strings.LabelSubtitle" :rows="3" />
       </div>
-      <div class="w-full p-1 default-style">
+      <div class="w-full p-1">
         <ui-rich-text-editor :label="$strings.LabelDescription" v-model="newEpisode.description" />
       </div>
     </div>
diff --git a/client/components/ui/RichTextEditor.vue b/client/components/ui/RichTextEditor.vue
index 582f5e8f..48abd6f0 100644
--- a/client/components/ui/RichTextEditor.vue
+++ b/client/components/ui/RichTextEditor.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="default-style">
     <p v-if="label" class="px-1 text-sm font-semibold" :class="{ 'text-gray-400': disabled }">
       {{ label }}
     </p>
@@ -29,7 +29,7 @@ export default {
     config() {
       return {
         toolbar: {
-          getDefaultHTML: () => `    <div class="trix-button-row">
+          getDefaultHTML: () => `<div class="trix-button-row">
       <span class="trix-button-group trix-button-group--text-tools" data-trix-button-group="text-tools">
         <button type="button" class="trix-button trix-button--icon trix-button--icon-bold" data-trix-attribute="bold" data-trix-key="b" title="#{lang.bold}" tabindex="-1">#{lang.bold}</button>
         <button type="button" class="trix-button trix-button--icon trix-button--icon-italic" data-trix-attribute="italic" data-trix-key="i" title="#{lang.italic}" tabindex="-1">#{lang.italic}</button>
diff --git a/client/pages/config/authentication.vue b/client/pages/config/authentication.vue
index 9e028307..199701b4 100644
--- a/client/pages/config/authentication.vue
+++ b/client/pages/config/authentication.vue
@@ -1,6 +1,18 @@
 <template>
   <div id="authentication-settings">
     <app-settings-content :header-text="$strings.HeaderAuthentication">
+      <div class="w-full border border-white/10 rounded-xl p-4 my-4 bg-primary/25">
+        <div class="flex items-center">
+          <ui-checkbox v-model="showCustomLoginMessage" checkbox-bg="bg" />
+          <p class="text-lg pl-4">Custom Message on Login</p>
+        </div>
+        <transition name="slide">
+          <div v-if="showCustomLoginMessage" class="w-full pt-4">
+            <ui-rich-text-editor v-model="newAuthSettings.authLoginCustomMessage" />
+          </div>
+        </transition>
+      </div>
+
       <div class="w-full border border-white/10 rounded-xl p-4 my-4 bg-primary/25">
         <div class="flex items-center">
           <ui-checkbox v-model="enableLocalAuth" checkbox-bg="bg" />
@@ -103,6 +115,7 @@ export default {
     return {
       enableLocalAuth: false,
       enableOpenIDAuth: false,
+      showCustomLoginMessage: false,
       savingSettings: false,
       newAuthSettings: {}
     }
@@ -221,6 +234,10 @@ export default {
         return
       }
 
+      if (!this.showCustomLoginMessage || !this.newAuthSettings.authLoginCustomMessage?.trim()) {
+        this.newAuthSettings.authLoginCustomMessage = null
+      }
+
       this.newAuthSettings.authActiveAuthMethods = []
       if (this.enableLocalAuth) this.newAuthSettings.authActiveAuthMethods.push('local')
       if (this.enableOpenIDAuth) this.newAuthSettings.authActiveAuthMethods.push('openid')
@@ -250,6 +267,7 @@ export default {
       }
       this.enableLocalAuth = this.authMethods.includes('local')
       this.enableOpenIDAuth = this.authMethods.includes('openid')
+      this.showCustomLoginMessage = !!this.authSettings.authLoginCustomMessage
     }
   },
   mounted() {
diff --git a/client/pages/login.vue b/client/pages/login.vue
index f7579dd6..c7efa0d0 100644
--- a/client/pages/login.vue
+++ b/client/pages/login.vue
@@ -28,6 +28,8 @@
 
         <div class="w-full h-px bg-white bg-opacity-10 my-4" />
 
+        <p v-if="loginCustomMessage" class="py-2 default-style mb-2" v-html="loginCustomMessage"></p>
+
         <p v-if="error" class="text-error text-center py-2">{{ error }}</p>
 
         <form v-show="login_local" @submit.prevent="submitForm">
@@ -113,6 +115,9 @@ export default {
     },
     openIDButtonText() {
       return this.authFormData?.authOpenIDButtonText || 'Login with OpenId'
+    },
+    loginCustomMessage() {
+      return this.authFormData?.authLoginCustomMessage || null
     }
   },
   methods: {
diff --git a/server/objects/settings/ServerSettings.js b/server/objects/settings/ServerSettings.js
index 6e9d8456..d3a6bdf0 100644
--- a/server/objects/settings/ServerSettings.js
+++ b/server/objects/settings/ServerSettings.js
@@ -55,7 +55,7 @@ class ServerSettings {
     this.buildNumber = packageJson.buildNumber
 
     // Auth settings
-    // Active auth methodes
+    this.authLoginCustomMessage = null
     this.authActiveAuthMethods = ['local']
 
     // openid settings
@@ -113,6 +113,7 @@ class ServerSettings {
     this.version = settings.version || null
     this.buildNumber = settings.buildNumber || 0 // Added v2.4.5
 
+    this.authLoginCustomMessage = settings.authLoginCustomMessage || null // Added v2.7.3
     this.authActiveAuthMethods = settings.authActiveAuthMethods || ['local']
 
     this.authOpenIDIssuerURL = settings.authOpenIDIssuerURL || null
@@ -201,6 +202,7 @@ class ServerSettings {
       logLevel: this.logLevel,
       version: this.version,
       buildNumber: this.buildNumber,
+      authLoginCustomMessage: this.authLoginCustomMessage,
       authActiveAuthMethods: this.authActiveAuthMethods,
       authOpenIDIssuerURL: this.authOpenIDIssuerURL,
       authOpenIDAuthorizationURL: this.authOpenIDAuthorizationURL,
@@ -213,7 +215,7 @@ class ServerSettings {
       authOpenIDButtonText: this.authOpenIDButtonText,
       authOpenIDAutoLaunch: this.authOpenIDAutoLaunch,
       authOpenIDAutoRegister: this.authOpenIDAutoRegister,
-      authOpenIDMatchExistingBy: this.authOpenIDMatchExistingBy, 
+      authOpenIDMatchExistingBy: this.authOpenIDMatchExistingBy,
       authOpenIDMobileRedirectURIs: this.authOpenIDMobileRedirectURIs // Do not return to client
     }
   }
@@ -246,6 +248,7 @@ class ServerSettings {
 
   get authenticationSettings() {
     return {
+      authLoginCustomMessage: this.authLoginCustomMessage,
       authActiveAuthMethods: this.authActiveAuthMethods,
       authOpenIDIssuerURL: this.authOpenIDIssuerURL,
       authOpenIDAuthorizationURL: this.authOpenIDAuthorizationURL,
@@ -264,7 +267,9 @@ class ServerSettings {
   }
 
   get authFormData() {
-    const clientFormData = {}
+    const clientFormData = {
+      authLoginCustomMessage: this.authLoginCustomMessage
+    }
     if (this.authActiveAuthMethods.includes('openid')) {
       clientFormData.authOpenIDButtonText = this.authOpenIDButtonText
       clientFormData.authOpenIDAutoLaunch = this.authOpenIDAutoLaunch