diff --git a/lam/lib/account.inc b/lam/lib/account.inc
index 7c940304..9afbadfc 100644
--- a/lam/lib/account.inc
+++ b/lam/lib/account.inc
@@ -1706,6 +1706,19 @@ function convertUtf8ToUtf16Le($input) {
 	return $output;
 }
 
+/**
+ * Returns the text with LAM and its version for header area.
+ *
+ * @return string LAM version text
+ */
+function getLAMVersionText() {
+	$text = 'LDAP Account Manager';
+	if (isLAMProVersion()) {
+		$text .= ' Pro';
+	}
+	return $text . ' - ' . LAMVersion();
+}
+
 /**
  * LAM exception with title and message.
  *
diff --git a/lam/lib/adminHeader.inc b/lam/lib/adminHeader.inc
index f053fd2a..477ed32f 100644
--- a/lam/lib/adminHeader.inc
+++ b/lam/lib/adminHeader.inc
@@ -3,7 +3,7 @@ namespace LAM\HEADER;
 /*
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2018  Roland Gruber
+  Copyright (C) 2018 - 2019  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -93,9 +93,8 @@ foreach ($toSort as $key => $value) {
 			<a class="lamLogo" href="https://www.ldap-account-manager.org/" target="new_window">
 				<span class="hide-on-tablet">&nbsp;</span>
 				<span class="hide-on-mobile">
-				LDAP Account Manager
 				<?php
-				echo $pro . " - " . LAMVersion();
+				echo getLAMVersionText();
 				?>
 				</span>
 			</a>
diff --git a/lam/lib/configPages.inc b/lam/lib/configPages.inc
index 5230a5e4..2e5a6df0 100644
--- a/lam/lib/configPages.inc
+++ b/lam/lib/configPages.inc
@@ -2,7 +2,7 @@
 namespace LAM\CONFIG;
 /*
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2017 - 2018  Roland Gruber
+  Copyright (C) 2017 - 2019  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -60,7 +60,9 @@ function printConfigurationPageHeaderBar($conf) {
 		<table border=0 width="100%" class="lamHeader ui-corner-all">
 			<tr>
 				<td align="left" height="30">
-					<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a>
+					<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">
+						<?php echo getLAMVersionText(); ?>
+					</a>
 				</td>
 				<td align="right">
 					<?php echo _('Server profile') . ': ' . $conf->getName(); ?>
diff --git a/lam/templates/config/conflogin.php b/lam/templates/config/conflogin.php
index 7b03532e..17bc16bf 100644
--- a/lam/templates/config/conflogin.php
+++ b/lam/templates/config/conflogin.php
@@ -12,7 +12,7 @@ use \htmlResponsiveInputField;
 use \htmlHorizontalLine;
 /*
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2018  Roland Gruber
+  Copyright (C) 2003 - 2019  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -83,7 +83,9 @@ $tabindex = 1;
 		<table border=0 width="100%" class="lamHeader ui-corner-all">
 			<tr>
 				<td align="left" height="30">
-					<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a>
+					<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">
+						<?php echo getLAMVersionText(); ?>
+					</a>
 				</td>
 			</tr>
 		</table>
diff --git a/lam/templates/config/index.php b/lam/templates/config/index.php
index 6e45ce05..a5119b88 100644
--- a/lam/templates/config/index.php
+++ b/lam/templates/config/index.php
@@ -2,7 +2,7 @@
 /*
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2018  Roland Gruber
+  Copyright (C) 2003 - 2019  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -48,7 +48,9 @@ printHeaderContents(_("Configuration overview"), '../..');
 		<table class="lamTop ui-corner-all">
 			<tr>
 				<td align="left">
-					<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a>
+					<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">
+						<?php echo getLAMVersionText(); ?>
+					</a>
 				</td>
 			</tr>
 		</table>
diff --git a/lam/templates/config/mainlogin.php b/lam/templates/config/mainlogin.php
index 55a223be..813cea8a 100644
--- a/lam/templates/config/mainlogin.php
+++ b/lam/templates/config/mainlogin.php
@@ -2,7 +2,7 @@
 /*
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2018  Roland Gruber
+  Copyright (C) 2003 - 2019  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -86,7 +86,9 @@ printHeaderContents(_("Login"), '../..');
 		<table border=0 width="100%" class="lamHeader ui-corner-all">
 			<tr>
 				<td align="left" height="30">
-					<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a>
+					<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">
+						<?php echo getLAMVersionText(); ?>
+					</a>
 				</td>
 			</tr>
 		</table>
diff --git a/lam/templates/config/mainmanage.php b/lam/templates/config/mainmanage.php
index e17273cf..547d1ded 100644
--- a/lam/templates/config/mainmanage.php
+++ b/lam/templates/config/mainmanage.php
@@ -275,7 +275,9 @@ printHeaderContents(_("Edit general settings"), '../..');
 		<table border=0 width="100%" class="lamHeader ui-corner-all">
 			<tr>
 				<td align="left" height="30">
-					<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a>
+					<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">
+						<?php echo getLAMVersionText(); ?>
+					</a>
 				</td>
 			</tr>
 		</table>
diff --git a/lam/templates/config/profmanage.php b/lam/templates/config/profmanage.php
index 3c36d43b..7c60ab5f 100644
--- a/lam/templates/config/profmanage.php
+++ b/lam/templates/config/profmanage.php
@@ -16,7 +16,7 @@ use \htmlLink;
 /*
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2018  Roland Gruber
+  Copyright (C) 2003 - 2019  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -164,7 +164,9 @@ printHeaderContents(_("Profile management"), '../..');
 		<table border=0 width="100%" class="lamHeader ui-corner-all">
 			<tr>
 				<td align="left" height="30">
-					<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">LDAP Account Manager</a>
+					<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">
+						<?php echo getLAMVersionText(); ?>
+					</a>
 				</td>
 			</tr>
 		</table>
diff --git a/lam/templates/login.php b/lam/templates/login.php
index 7d36fe1b..c28ac82b 100644
--- a/lam/templates/login.php
+++ b/lam/templates/login.php
@@ -18,7 +18,7 @@ use \htmlDiv;
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2003 - 2006  Michael Duergner
-                2005 - 2018  Roland Gruber
+                2005 - 2019  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -218,12 +218,8 @@ function display_LoginPage($licenseValidator, $error_message) {
 			<tr>
 				<td align="left" height="30" width="34%">
 					<a class="lamLogo" href="http://www.ldap-account-manager.org/" target="new_window">
-					LAM
 					<?php
-						if (isLAMProVersion()) {
-							echo 'Pro ';
-						}
-						echo ' - ' . LAMVersion();
+						echo getLAMVersionText();
 					?>
 					</a>
 				</td>