diff --git a/app/assets/javascripts/app/controllers/_settings/area_logo.coffee b/app/assets/javascripts/app/controllers/_settings/area_logo.coffee
index 7f10c5058..55a8be865 100644
--- a/app/assets/javascripts/app/controllers/_settings/area_logo.coffee
+++ b/app/assets/javascripts/app/controllers/_settings/area_logo.coffee
@@ -17,6 +17,7 @@ class App.SettingsAreaLogo extends App.Controller
     localElement.find('.js-loginPreview').html( App.view('generic/login_preview')(
       logoUrl: @logoUrl()
       logoChange: true
+      maintananceChange: false
     ))
     @html localElement
 
diff --git a/app/assets/javascripts/app/controllers/maintenance.coffee b/app/assets/javascripts/app/controllers/maintenance.coffee
index 874a2ae21..a13ac5ad6 100644
--- a/app/assets/javascripts/app/controllers/maintenance.coffee
+++ b/app/assets/javascripts/app/controllers/maintenance.coffee
@@ -22,6 +22,8 @@ class Index extends App.ControllerSubContent
     localElement = $(App.view('maintenance')())
     localElement.find('.js-loginPreview').html( App.view('generic/login_preview')(
       logoUrl: @logoUrl()
+      logoChange: false
+      maintananceChange: true
     ))
 
     localElement.find('.js-textarea').ce({
diff --git a/app/assets/javascripts/app/views/generic/login_preview.jst.eco b/app/assets/javascripts/app/views/generic/login_preview.jst.eco
index e985dd4a3..f68f60434 100644
--- a/app/assets/javascripts/app/views/generic/login_preview.jst.eco
+++ b/app/assets/javascripts/app/views/generic/login_preview.jst.eco
@@ -1,13 +1,14 @@
 <div class="login branding centered darkBackground vertical">
+  <% if @maintananceChange: %>
+    <% if @C('maintenance_mode'): %>
+      <div class="hero-unit alert alert--danger"><%- @T('Zammad is currently in maintenance mode. Only administrators can login. Please wait until the maintenance window is over.') %></div>
+    <% end %>
 
-  <% if @C('maintenance_mode'): %>
-    <div class="hero-unit alert alert--danger"><%- @T('Zammad is currently in maintenance mode. Only administrators can login. Please wait until the maintenance window is over.') %></div>
-  <% end %>
-
-  <% if !@logoChange || @C('maintenance_login'): %>
-  <form>
-    <div contenteditable id="maintenance-message" data-name="message" class="hero-unit alert alert--success js-textarea js-Login" <% if !@C('maintenance_login'): %>style="opacity: 0.5;"<% end %>><%- @C('maintenance_login_message') %></div>
-  </form>
+    <% if !@logoChange || @C('maintenance_login'): %>
+    <form>
+      <div contenteditable id="maintenance-message" data-name="message" class="hero-unit alert alert--success js-textarea js-Login" <% if !@C('maintenance_login'): %>style="opacity: 0.5;"<% end %>><%- @C('maintenance_login_message') %></div>
+    </form>
+    <% end %>
   <% end %>
 
   <div class="hero-unit">