diff --git a/lib/SimpleSAML/Auth/LDAP.php b/lib/SimpleSAML/Auth/LDAP.php
index feea4699b595677744820028e4dde59432cd3f3c..d7136a96269c8d870b6ec315c97c5e5819cd4211 100644
--- a/lib/SimpleSAML/Auth/LDAP.php
+++ b/lib/SimpleSAML/Auth/LDAP.php
@@ -127,7 +127,7 @@ class SimpleSAML_Auth_LDAP {
 				return NULL;
 			} else {
 				throw new Exception('LDAP search returned zero entries: ' . $searchattr . '=' . $searchvalue . ' base(s): ' . 
-					join(',', $searchbases));
+					join(' & ', $searchbases));
 			}
 		}		
 
diff --git a/modules/ldapstatus/templates/default/ldapstatus.php b/modules/ldapstatus/templates/default/ldapstatus.php
index 670b1784ec010d92a6f93a1f4136b7025a1f444c..0e01593891f7f85bf203e665bfd73efa6b1e05b1 100644
--- a/modules/ldapstatus/templates/default/ldapstatus.php
+++ b/modules/ldapstatus/templates/default/ldapstatus.php
@@ -12,14 +12,14 @@ $this->includeAtTemplateBase('includes/header.php');
 	<tr>
 		<th>Name of institusion</th>
 		<th>Conf</th>
-		<th>Meta</th>
 		<th>Ping</th>
 		<th>Admin bind()</th>
-		<th>Search bogus</th>
-		<th>Search test</th>
+		<th>S=bogus</th>
 		<th>test</th>
-		<th>Bind test</th>
-		<th>GetAttr</th>
+		<th>S=test</th>
+		<th>test bind()</th>
+		<th>attributes</th>
+		<th>Meta</th>
 	</tr>
 
 <?php
@@ -60,14 +60,14 @@ foreach($this->data['sortedOrgIndex'] as $orgkey) {
 		echo('<td><span style="color: #b4b4b4; font-size: x-small">NA</span> <tt>' . $orgkey . '</tt></td>');
 	}
 	showRes('config',  $res, $this);
-	showRes('configMeta',  $res, $this);
 	showRes('ping',  $res, $this);
 	showRes('adminBind',  $res, $this);
 	showRes('ldapSearchBogus',  $res, $this);
-	showRes('ldapSearchTestUser',  $res, $this);
 	showRes('configTest',  $res, $this);
+	showRes('ldapSearchTestUser',  $res, $this);
 	showRes('ldapBindTestUser',  $res, $this);
 	showRes('ldapGetAttributesTestUser',  $res, $this);
+	showRes('configMeta',  $res, $this);
 	echo('</tr>');
 }
 ?>
diff --git a/modules/ldapstatus/www/index.php b/modules/ldapstatus/www/index.php
index d547a401631cf68e697e7994541987d6e6cb83e9..4bea0d1d2aa30ee72498062dce7011be6e68b865 100644
--- a/modules/ldapstatus/www/index.php
+++ b/modules/ldapstatus/www/index.php
@@ -150,7 +150,7 @@ foreach ($orgs AS $orgkey => $orgconfig) {
 
 function resultCode($res) {
 	$code = '';
-	$columns = array('config', 'configMeta', 'ping', 'adminUser', 'ldapSearchBogus', 'configTest', 'ldapSearchTestUser', 'ldapBindTestUser', 'ldapGetAttributesTestUser');
+	$columns = array('config', 'ping', 'adminBind', 'ldapSearchBogus', 'configTest', 'ldapSearchTestUser', 'ldapBindTestUser', 'ldapGetAttributesTestUser', 'configMeta');
 	foreach ($columns AS $c) {
 		if (array_key_exists($c, $res)) {
 			$code .= ($res[$c][0] ? '0' : '2');