diff --git a/modules/ldapstatus/templates/ldapsinglehost.php b/modules/ldapstatus/templates/ldapsinglehost.php
index 4c9a3dde09b9a31b27bd98fa154b49d1ff62715a..b3a11b85071c1c3a57e1d19354c77bcffb25c7de 100644
--- a/modules/ldapstatus/templates/ldapsinglehost.php
+++ b/modules/ldapstatus/templates/ldapsinglehost.php
@@ -150,7 +150,10 @@ if ($ok) {
 
 
 
-
+<h2>Debug log</h2>
+<pre style="background: #eee; border: 1px solid #aaa">
+<?php echo join("\n", $this->data['debugLog']); ?>
+</pre>
 
 
 <?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
diff --git a/modules/ldapstatus/www/index.php b/modules/ldapstatus/www/index.php
index 9caa4444e541b71dee5d387eeb2741c54bc154eb..97d0f7547f62249604468450e9469279cdff11c5 100644
--- a/modules/ldapstatus/www/index.php
+++ b/modules/ldapstatus/www/index.php
@@ -112,6 +112,8 @@ if (array_key_exists('orgtest', $_REQUEST)) {
 	$locindex = 0;
 	if (array_key_exists('locindex', $_REQUEST)) $locindex = $_REQUEST['locindex'];
 	
+	SimpleSAML_Logger::setCaptureLog();
+	
 	$orgconfig = SimpleSAML_Configuration::loadFromArray($orgs[$_REQUEST['orgtest']], 'org:[' . $_REQUEST['orgtest'] . ']');
 	$orgloc = $orgs[$_REQUEST['orgtest']]['locations'][$locindex];
 	$orgloc = mergeWithTemplate($orgloc, $locationTemplate);
@@ -126,6 +128,7 @@ if (array_key_exists('orgtest', $_REQUEST)) {
 	
 	$t->data['res'] = $res;
 	$t->data['org'] = $orgs[$_REQUEST['orgtest']];
+	$t->data['debugLog'] = SimpleSAML_Logger::getCapturedLog();
 	if ($isAdmin) $t->data['secretURL'] = $secretURL;
 	$t->show();
 	exit;