diff --git a/modules/core/templates/short_sso_interval.twig b/modules/core/templates/short_sso_interval.twig
new file mode 100644
index 0000000000000000000000000000000000000000..91288cd9f7d5cfe94ca5b20de621dcb4c51262ac
--- /dev/null
+++ b/modules/core/templates/short_sso_interval.twig
@@ -0,0 +1,16 @@
+{% set pagetitle = 'SimpleSAMLphp'|trans %}
+{% extends "base.twig" %}
+
+{% block content %}
+    <h1>{{ header }}</h1>
+    <form style="display: inline; margin: 0px; padding: 0px" action="{{ target|escape('html') }}">
+        {% for name, value in params %}
+            <input type="hidden" name="{{ name|escape('html') }}" value="{{ value|escape('html') }}" />
+        {% endfor %}
+        <p>{{ '{core:short_sso_interval:warning}'|trans }}</p>
+        <div class="trackidtext">
+            <p>{{ '{errors:report_trackid}'|trans }}<span class="trackid">{{ trackId }}</span></p>
+        </div>
+        <input type="submit" name="continue" id="contbutton" value="'{core:short_sso_interval:retry}'|trans|escape('html') }}" />
+    </form>
+{% endblock %}
diff --git a/modules/core/templates/show_metadata.twig b/modules/core/templates/show_metadata.twig
new file mode 100644
index 0000000000000000000000000000000000000000..29c0e590c9627eb53b63ef7d3ea899e2721b676c
--- /dev/null
+++ b/modules/core/templates/show_metadata.twig
@@ -0,0 +1,19 @@
+{% set pagetitle = 'SimpleSAMLphp Show Metadata'|trans %}
+{% extends "base.twig" %}
+
+{% block postload %}
+    <script type="text/javascript">
+        var clipboard = new Clipboard('#btncp');
+    </script>
+{% endblock %}
+
+{% block content %}
+    <div class="metadatabox">
+        <button data-clipboard-target="#metadata" id="btncp" class="btn" style="margin-right: 0.5em; float: right">
+            <img src="/{{baseurlpath}}resources/icons/clipboard.svg" alt="Copy to clipboard" />
+        </button>
+        <pre id="metadata">$metadata['{{ entityid }}'] => {{ metadata }}</pre>
+    </div>
+    <br />
+    <p><a href="{{ backlink }}"><span class="btn">Back</span></a></p>
+{% endblock %}
diff --git a/modules/core/www/short_sso_interval.php b/modules/core/www/short_sso_interval.php
index 0690b1b4f581c3d40e217a24d6a5d25871aa50fa..1c598c4832b8c2896f1cdfc642bc7e8a42a8bf65 100644
--- a/modules/core/www/short_sso_interval.php
+++ b/modules/core/www/short_sso_interval.php
@@ -23,4 +23,6 @@ $t = new SimpleSAML_XHTML_Template($globalConfig, 'core:short_sso_interval.php')
 $t->data['target'] = SimpleSAML\Module::getModuleURL('core/short_sso_interval.php');
 $t->data['params'] = array('StateId' => $id);
 $t->data['trackId'] = $session->getTrackID();
+$this->data['header'] = $this->t('{core:short_sso_interval:warning_header}');
+$this->data['autofocus'] = 'contbutton';
 $t->show();
diff --git a/modules/core/www/show_metadata.php b/modules/core/www/show_metadata.php
index fd03d9f56a6ec113770db3b6aa16f426e5815934..82a30e7acff5552ab729f645da74ea72b44dd685 100644
--- a/modules/core/www/show_metadata.php
+++ b/modules/core/www/show_metadata.php
@@ -29,6 +29,6 @@ $t->data['clipboard.js'] = true;
 $t->data['pageid'] = 'show_metadata';
 $t->data['header'] = 'SimpleSAMLphp Show Metadata';
 $t->data['backlink'] = SimpleSAML\Module::getModuleURL('core/frontpage_federation.php');
-$t->data['m'] = $m;
-
+$t->data['entityid'] = $m['entityid'];
+$t->data['metadata'] = var_export($m, true);
 $t->show();