diff --git a/modules/cron/templates/croninfo-result.php b/modules/cron/templates/croninfo-result.php
index 8cecb58344ca539ae3dcc3c87214d23c6c376396..e4f0dc1695a06d856d5eba5a01732e0810641ca2 100644
--- a/modules/cron/templates/croninfo-result.php
+++ b/modules/cron/templates/croninfo-result.php
@@ -8,7 +8,7 @@ $this->includeAtTemplateBase('includes/header.php');
 <?php
 
 echo '            <h1>'.$this->t('cron_report_title').'</h1><p>'.$this->t('ran_text').
-    ' '.$this->data['time'].'</p>'.'<p>URL: <tt>'.$this->data['url'].'</tt></p>'.
+    ' '.$this->data['time'].'</p>'.'<p>URL: <code>'.$this->data['url'].'</code></p>'.
     '<p>Tag: '.$this->data['tag']."</p>\n\n".
     '<ul><li>'.join('</li><li>', $this->data['summary']).'</li></ul>';
 ?>
diff --git a/modules/cron/www/cron.php b/modules/cron/www/cron.php
index 4a2ec9ab9ad38faa42d01f986366b35ee1287960..fb930592812ce20bf6370618cdb708677d63cb81 100644
--- a/modules/cron/www/cron.php
+++ b/modules/cron/www/cron.php
@@ -24,7 +24,7 @@ $summary = $croninfo['summary'];
 
 if ($cronconfig->getValue('sendemail', true) && count($summary) > 0) {
     $message = '<h1>Cron report</h1><p>Cron ran at '.$time.'</p>'.
-        '<p>URL: <tt>'.$url.'</tt></p>'.
+        '<p>URL: <code>'.$url.'</code></p>'.
         '<p>Tag: '.$croninfo['tag']."</p>\n\n".
         '<ul><li>'.join('</li><li>', $summary).'</li></ul>';
 
diff --git a/modules/oauth/templates/registry.list.php b/modules/oauth/templates/registry.list.php
index 912f5a71ce43a86feac71e368b7f04dd9648d630..bbccab1d9e00a5ed0b440e3144e8230d79cc451a 100644
--- a/modules/oauth/templates/registry.list.php
+++ b/modules/oauth/templates/registry.list.php
@@ -16,8 +16,8 @@ foreach ($this->data['entries']['mine'] as $entryc) {
     $entry = $entryc['value'];
     $i++;
     echo '<tr class="'.$rows[$i % 2].'"><td>'.
-        htmlspecialchars($entry['name']).'</td>	<td><tt>'.htmlspecialchars($entry['key']).
-        '</tt></td><td><a href="registry.edit.php?editkey='.urlencode($entry['key']).
+        htmlspecialchars($entry['name']).'</td>	<td><code>'.htmlspecialchars($entry['key']).
+        '</code></td><td><a href="registry.edit.php?editkey='.urlencode($entry['key']).
         '">edit</a><a href="registry.php?delete='.urlencode($entry['key']).'">delete</a></td></tr>';
 }
 if ($i == 0) {
@@ -35,8 +35,8 @@ foreach ($this->data['entries']['others'] as $entryc) {
     $entry = $entryc['value'];
     $i++;
     echo '<tr class="'.$rows[$i % 2].'"><td>'.
-        htmlspecialchars($entry['name']).'</td><td><tt>'.htmlspecialchars($entry['key']).
-        '</tt></td><td>'.(isset($entry['owner']) ? htmlspecialchars($entry['owner']) : 'No owner').
+        htmlspecialchars($entry['name']).'</td><td><code>'.htmlspecialchars($entry['key']).
+        '</code></td><td>'.(isset($entry['owner']) ? htmlspecialchars($entry['owner']) : 'No owner').
         '</td></tr>';
 }
 if ($i == 0) {
diff --git a/templates/includes/attributes.php b/templates/includes/attributes.php
index 3d80a035a50ac0e432ef1712ea6f05521e9d5d23..68230ce749193c4705b4b52eafab2741ae0546bd 100644
--- a/templates/includes/attributes.php
+++ b/templates/includes/attributes.php
@@ -78,7 +78,7 @@ function present_attributes(\SimpleSAML\XHTML\Template $t, $attributes, $namePar
                 if ($nameraw !== $name) {
                     $str .= htmlspecialchars($name).'<br/>';
                 }
-                $str .= '<tt>'.htmlspecialchars($nameraw).'</tt>';
+                $str .= '<code>'.htmlspecialchars($nameraw).'</code>';
                 $str .= '</td><td class="attrvalue"><ul>';
                 foreach ($value as $listitem) {
                     if ($nameraw === 'jpegPhoto') {
@@ -93,7 +93,7 @@ function present_attributes(\SimpleSAML\XHTML\Template $t, $attributes, $namePar
                 if ($nameraw !== $name) {
                     $str .= htmlspecialchars($name).'<br/>';
                 }
-                $str .= '<tt>'.htmlspecialchars($nameraw).'</tt>';
+                $str .= '<code>'.htmlspecialchars($nameraw).'</code>';
                 $str .= '</td>';
                 if ($nameraw === 'jpegPhoto') {
                     $str .= '<td class="attrvalue"><img src="data:image/jpeg;base64,'.htmlspecialchars($value[0]).
diff --git a/www/errorreport.php b/www/errorreport.php
index 4ffe52452765c566be4f4422d3da2bec0e804046..303c978772087168e80c609dcf958fce6978a637 100644
--- a/www/errorreport.php
+++ b/www/errorreport.php
@@ -69,11 +69,11 @@ $message = <<<MESSAGE
 <p>Track ID:</p>
 <pre>%s</pre>
 
-<p>Version: <tt>%s</tt></p>
+<p>Version: <code>%s</code></p>
 
-<p>Report ID: <tt>%s</tt></p>
+<p>Report ID: <code>%s</code></p>
 
-<p>Referer: <tt>%s</tt></p>
+<p>Referer: <code>%s</code></p>
 
 <hr />
 <div class="footer">