diff --git a/templates/default/en/status.php b/templates/default/en/status.php
index 4209344128b131459850a3faba24405bf7eaa424..7f6bb4a7497611eb5edb6bc84c11471693ceda34 100644
--- a/templates/default/en/status.php
+++ b/templates/default/en/status.php
@@ -36,9 +36,12 @@
 		?>
 		</table>
 
+	<?php if (isset($this->data['logout'])) { ?>
 	<h2>Logout</h2>
 
-		<p><?php echo $data['logout']; ?></p>
+		<p><?php echo $this->data['logout']; ?></p>
+
+	<?php } ?>
 	
 	<h2>About simpleSAMLphp</h2>
 	<p>Hey! This simpleSAMLphp thing is pretty cool, where can I read more about it?
diff --git a/www/example-simple/hostnames.php b/www/example-simple/hostnames.php
index 55458ed23649fa0763515e78643344e92b8ce8ca..9a06cb8c8075c5441e0f8fc3e46870c55475a743 100644
--- a/www/example-simple/hostnames.php
+++ b/www/example-simple/hostnames.php
@@ -47,7 +47,7 @@ $et->data['header'] = 'SimpleSAMLphp Diagnostics';
 $et->data['remaining'] = 'na';
 $et->data['attributes'] = $attributes;
 $et->data['valid'] = 'na';
-$et->data['logout'] = '';
+$et->data['logout'] = null;
 
 $et->show();
 
diff --git a/www/example-simple/shib13-example.php b/www/example-simple/shib13-example.php
index a87da040d420a03dfa3de0516fdf5e597d842ab1..dbbf689c1aaa433482a2ef998182ec3c394db22f 100644
--- a/www/example-simple/shib13-example.php
+++ b/www/example-simple/shib13-example.php
@@ -50,7 +50,7 @@ $t = new SimpleSAML_XHTML_Template($config, 'status.php');
 $t->data['header'] = 'Shibboleth demo';
 $t->data['remaining'] = $session->remainingTime();
 $t->data['attributes'] = $session->getAttributes();
-$t->data['logout'] = 'Shibboleth logout not implemented yet.';
+$t->data['logout'] = null;
 $et->data['icon'] = 'bino.png';
 $t->show();