diff --git a/pam_login.cgi b/pam_login.cgi
index 6c3b9cd9d..8925995a0 100755
--- a/pam_login.cgi
+++ b/pam_login.cgi
@@ -128,7 +128,9 @@ embed_logo();
 
 # Login message
 my $host;
-if ($gconfig{'realname'}) {
+if ($theme_config{'settings_login_page_server_name'}) {
+    $host = $theme_config{'settings_login_page_server_name'};
+} elsif ($gconfig{'realname'}) {
     $host = &get_system_hostname();
 } else {
     $host = get_env('server_name');
diff --git a/session_login.cgi b/session_login.cgi
index ae301aa9b..c2a14d6d3 100755
--- a/session_login.cgi
+++ b/session_login.cgi
@@ -138,7 +138,9 @@ embed_logo();
 
 # Login message
 my $host;
-if ($gconfig{'realname'}) {
+if ($theme_config{'settings_login_page_server_name'}) {
+    $host = $theme_config{'settings_login_page_server_name'};
+} elsif ($gconfig{'realname'}) {
     $host = &get_display_hostname();
 } else {
     $host = get_env('server_name');