diff --git a/rugwebsite/__init__.py b/rugwebsite/__init__.py
index 6fd5ff1..f53b2e0 100644
--- a/rugwebsite/__init__.py
+++ b/rugwebsite/__init__.py
@@ -1 +1 @@
-__version__ = '0.1.15'
\ No newline at end of file
+__version__ = '0.1.16'
\ No newline at end of file
diff --git a/rugwebsite/templates/rugwebsite/base.html b/rugwebsite/templates/rugwebsite/base.html
index 40d1be3..4a87888 100755
--- a/rugwebsite/templates/rugwebsite/base.html
+++ b/rugwebsite/templates/rugwebsite/base.html
@@ -38,7 +38,7 @@
               </li>
               {% if user.is_authenticated %}
               <li class="rug-nav--meta__item rug-mr-xs">
-                <a href="#" class=""><span class="rug-icon rug-icon--user rug-mr-xs" aria-hidden="true"></span><span>Welcome {{ user.get_username }}</span><span class="rug-icon rug-icon--caret-down rug-ml-xs"></span></a>
+                <a href="#" class=""><span class="rug-icon rug-icon--user rug-mr-xs" aria-hidden="true"></span><span>Welcome {{ user.get_username }}</span></a>
                 {% comment %}<div class="rug-nav--meta__flyout">
                   <ul class="rug-list--unstyled">
                     <li>
@@ -47,6 +47,10 @@
                   </ul>{% endcomment %}
                 </div>
               </li>
+              {% else %}
+              <li class="rug-nav--meta__item rug-mr-xs">
+                <a href="{% url 'saml2_auth' %}" class=""><span class="rug-icon rug-icon--user rug-mr-xs" aria-hidden="true"></span><span>Login</span></a>
+              </li>
               {% endif %}
             </ul>
           </nav>
diff --git a/rugwebsite/templates/rugwebsite/home.html b/rugwebsite/templates/rugwebsite/home.html
index 1d90a6b..e7f824d 100755
--- a/rugwebsite/templates/rugwebsite/home.html
+++ b/rugwebsite/templates/rugwebsite/home.html
@@ -5,4 +5,14 @@
 
 {% block content %}
 
+  {% if user.is_authenticated %}
+  <h1>Fantastic, you are logged in!</h1>
+  <p>Username: {{ user.username }}</p>
+  <p>First name: {{ user.firsts_name }}</p>
+  <p>Last name: {{ user.last_name}}</p>
+  <p>E-mail: {{ user.email}}</p>
+  {% else %}
+  <h1>Login and become awesome!</h1>
+  <p><a href="{% url 'saml2_auth' %}">Login</a></p>
+  {% endif %}
 {% endblock content %}