diff --git a/app/assets/javascripts/app/views/login.jst.eco b/app/assets/javascripts/app/views/login.jst.eco
index 3b1506dc9..865ba4d13 100644
--- a/app/assets/javascripts/app/views/login.jst.eco
+++ b/app/assets/javascripts/app/views/login.jst.eco
@@ -1,7 +1,7 @@
 <div class="login fullscreen">
   <div class="fullscreen-center">
     <div class="fullscreen-body">
-      <p><%- @T('Login with %s', @C('fqdn')) %></p>
+      <p><%- @T('Log in to %s', @C('fqdn')) %></p>
 
       <% if @C('maintenance_mode'): %>
         <div class="hero-unit alert alert--danger js-maintenanceMode"><%- @T('Zammad is currently in maintenance mode. Only administrators can login. Please wait until the maintenance window is over.') %></div>
diff --git a/spec/system/import/freshdesk_spec.rb b/spec/system/import/freshdesk_spec.rb
index e5fc58ba6..55966e752 100644
--- a/spec/system/import/freshdesk_spec.rb
+++ b/spec/system/import/freshdesk_spec.rb
@@ -112,7 +112,7 @@ RSpec.describe 'Import Freshdesk', type: :system, set_up: false, authenticated_a
 
       Rake::Task['zammad:setup:auto_wizard'].execute
 
-      expect(page).to have_text('Login')
+      expect(page).to have_text(Setting.get('fqdn'))
     end
   end
 end
diff --git a/spec/system/import/zendesk_spec.rb b/spec/system/import/zendesk_spec.rb
index 40058452e..e446b0872 100644
--- a/spec/system/import/zendesk_spec.rb
+++ b/spec/system/import/zendesk_spec.rb
@@ -121,7 +121,7 @@ RSpec.describe 'Import Zendesk', type: :system, set_up: false, authenticated_as:
 
       Rake::Task['zammad:setup:auto_wizard'].execute
 
-      expect(page).to have_text('Login')
+      expect(page).to have_text(Setting.get('fqdn'))
     end
   end
 end
diff --git a/spec/system/login_spec.rb b/spec/system/login_spec.rb
new file mode 100644
index 000000000..f7a57b3b1
--- /dev/null
+++ b/spec/system/login_spec.rb
@@ -0,0 +1,13 @@
+# Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/
+
+require 'rails_helper'
+
+RSpec.describe 'Login', type: :system, authenticated_as: false do
+  before do
+    visit '/'
+  end
+
+  it 'fqdn is visible on login page' do
+    expect(page).to have_css('.login p', text: Setting.get('fqdn'))
+  end
+end
diff --git a/test/browser/keyboard_shortcuts_test.rb b/test/browser/keyboard_shortcuts_test.rb
index ae7aa5f65..dc166b1ea 100644
--- a/test/browser/keyboard_shortcuts_test.rb
+++ b/test/browser/keyboard_shortcuts_test.rb
@@ -221,10 +221,9 @@ class KeyboardShortcutsTest < TestCase
 
     shortcut(key: 'e')
     watch_for(
-      css:     'body',
-      value:   'login',
+      css:     '#login',
+      value:   'username',
       timeout: 4,
     )
-
   end
 end
diff --git a/test/integration/otrs_import_browser_test.rb b/test/integration/otrs_import_browser_test.rb
index f8f581c38..62e3534a1 100644
--- a/test/integration/otrs_import_browser_test.rb
+++ b/test/integration/otrs_import_browser_test.rb
@@ -55,8 +55,8 @@ class OtrsImportBrowserTest < TestCase
     click(css: '.js-migration-start')
 
     watch_for(
-      css:     'body',
-      value:   'login',
+      css:     '#login',
+      value:   'username',
       timeout: 600,
     )