diff --git a/lam/templates/3rdParty/pla/htdocs/import_form.php b/lam/templates/3rdParty/pla/htdocs/import_form.php
index 9c6bbbb6..9aefe6e4 100644
--- a/lam/templates/3rdParty/pla/htdocs/import_form.php
+++ b/lam/templates/3rdParty/pla/htdocs/import_form.php
@@ -17,7 +17,6 @@ if (! ini_get('file_uploads'))
 
 $request['page'] = new PageRender($app['server']->getIndex(),get_request('template','REQUEST',false,'none'));
 $request['page']->drawTitle(sprintf('<b>%s</b>',_('Import')));
-$request['page']->drawSubTitle(sprintf('%s: <b>%s</b>',_('Server'),$app['server']->getName()));
 
 echo '<form action="cmd.php" method="post" class="new_value" enctype="multipart/form-data">';
 echo '<div>';
diff --git a/lam/templates/3rdParty/pla/htdocs/mass_edit.php b/lam/templates/3rdParty/pla/htdocs/mass_edit.php
index 1ea70013..b4e38e36 100644
--- a/lam/templates/3rdParty/pla/htdocs/mass_edit.php
+++ b/lam/templates/3rdParty/pla/htdocs/mass_edit.php
@@ -61,7 +61,6 @@ if (! count($request['page']))
 
 # We'll render this forms Title with the first DN's object.
 $request['page'][0]->drawTitle(_('Bulk edit the following DNs'));
-$request['page'][0]->drawSubTitle(sprintf('%s: <b>%s</b>',_('Server'),$app['server']->getName()));
 
 echo '<form action="cmd.php" method="post">';
 echo '<div>';
diff --git a/lam/templates/3rdParty/pla/htdocs/mass_update.php b/lam/templates/3rdParty/pla/htdocs/mass_update.php
index 8a9dd01e..ad16f35c 100644
--- a/lam/templates/3rdParty/pla/htdocs/mass_update.php
+++ b/lam/templates/3rdParty/pla/htdocs/mass_update.php
@@ -46,7 +46,6 @@ foreach ($request['dn'] as $index => $dn) {
 
 # We can use the $render to give us a title
 $render->drawTitle(_('Bulk update the following DNs'));
-$render->drawSubTitle(sprintf('%s: <b>%s</b>',_('Server'),$app['server']->getName()));
 
 if (count($request['update'])) {
 	if (get_request('confirm','REQUEST')) {
diff --git a/lam/templates/3rdParty/pla/lib/QueryRender.php b/lam/templates/3rdParty/pla/lib/QueryRender.php
index 0e6d1300..237dd0d0 100644
--- a/lam/templates/3rdParty/pla/lib/QueryRender.php
+++ b/lam/templates/3rdParty/pla/lib/QueryRender.php
@@ -432,20 +432,7 @@ class QueryRender extends PageRender {
 	}
 
 	public function drawSubTitle($subtitle=null) {
-		if (is_null($subtitle)) {
-			$server = $this->getServer();
-	
-			$subtitle = sprintf('%s: <b>%s</b>',_('Server'),$server->getName());
-
-			if ($this->template) {
-				$subtitle .= '<br />';
-				$subtitle .= sprintf('%s: <b>%s</b>',('Query'),$this->template->getID() != 'none' ? $this->template->getTitle() : _('Default'));
-				if ($this->template->getName())
-					$subtitle .= sprintf(' (<b>%s</b>)',$this->template->getName(false));
-			}
-		}
-
-		parent::drawSubTitle($subtitle);
+		return;
 	}
 
 	private function getAFattrs() {
diff --git a/lam/templates/3rdParty/pla/lib/functions.php b/lam/templates/3rdParty/pla/lib/functions.php
index 47346935..c6c7c7e5 100644
--- a/lam/templates/3rdParty/pla/lib/functions.php
+++ b/lam/templates/3rdParty/pla/lib/functions.php
@@ -188,7 +188,7 @@ function app_error_handler($errno,$errstr,$file,$lineno) {
  * Returns the application name.
  */
 function app_name() {
-	return 'phpLDAPadmin';
+	return 'LDAP Account Manager';
 }
 
 /**
@@ -198,33 +198,7 @@ function app_name() {
  * @return string The current version as read from the VERSION file.
  */
 function app_version() {
-	static $CACHE = null;
-
-	if ($CACHE)
-		return $CACHE;
-
-	$version_file = realpath(LIBDIR.'../VERSION');
-	if (! file_exists($version_file))
-		$CACHE = 'UNKNOWN';
-
-	else {
-		$version = rtrim(file_get_contents($version_file));
-
-		$CACHE = preg_replace('/^RELEASE-([0-9\.]+(-.*)*)$/','$1',$version);
-
-		# Check if we are a CVS copy.
-		if (preg_match('/^(DEVEL)?$/',$CACHE))
-			$CACHE = 'DEVEL';
-
-		# Check if we are special DEVEL version
-		elseif (preg_match('/^DEVEL-([0-9\.]+)+$/',$CACHE)) {}
-
-		# If return is still the same as version, then the tag is not one we expect.
-		elseif ($CACHE == $version)
-			$CACHE = 'UNKNOWN';
-	}
-
-	return $CACHE;
+	return LAMVersion();
 }
 
 /**