diff --git a/templates/base.html b/templates/base.html
index 53e32d5..2838343 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -17,7 +17,6 @@
         <div id="navbar" class="collapse navbar-collapse">
           <ul class="nav navbar-nav">
 	    {% if current_user.is_authenticated() %}
-            <li><a href="{{ url_for('user') }}">User</a></li>
             <li><a href="{{ url_for('logout') }}">Logout</a></li>
 	    {% endif %}
           </ul>
diff --git a/templates/main_page.html b/templates/main_page.html
index f578232..2834f31 100644
--- a/templates/main_page.html
+++ b/templates/main_page.html
@@ -1,9 +1,30 @@
 {% extends 'base.html' %}
 {% block content %}
-    <p class="lead">Select the IdP you want to use to authenticate:</p>
-    <ol>
-      {% for idp in idp_dict.keys() %}
-      <li><a href="/saml/login/{{idp}}">{{idp}}</a></li>
+{% if current_user.is_authenticated() %}
+<div class="container">
+  <h1>Logged in</h1>
+  <p class="lead">
+    Contents of the most recent SAML assertion:
+    </p>
+  <div class="col-md-8">
+    <table class="table">
+    {% if session.saml_attributes %}
+      {% for attribute in session.saml_attributes.keys() %}
+      <tr>
+	<td>{{ attribute }}</td>
+	<td>{{ session.saml_attributes[attribute][0] }}</td>
+      </tr>
       {% endfor %}
-    </ol>
+    {% endif %}
+    </table>
+  </div>
+</div>
+{% else %}
+<p class="lead">Select the IdP you want to use to authenticate:</p>
+<ol>
+  {% for idp in idp_dict.keys() %}
+  <li><a href="/saml/login/{{idp}}">{{idp}}</a></li>
+  {% endfor %}
+</ol>
+{% endif %}
 {% endblock %}
diff --git a/templates/user.html b/templates/user.html
deleted file mode 100644
index e150520..0000000
--- a/templates/user.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends 'base.html' %}
-{% block content %}
-<div class="container">
-  <h1>Logged in</h1>
-  <p class="lead">
-    Contents of the most recent SAML assertion:
-    </p>
-  <div class="col-md-8">
-    <table class="table">
-      {% if session.saml_attributes %}
-    {% for attribute in session.saml_attributes.keys() %}
-      <tr>
-	<td>{{ attribute }}</td>
-	<td>{{ session.saml_attributes[attribute][0] }}</td>
-      </tr>
-      {% endfor %}
-      {% endif %}
-    </table>
-    </div>
-  </div>
-{% endblock %}