diff --git a/main.py b/main.py
index a7182a0..e104591 100644
--- a/main.py
+++ b/main.py
@@ -34,12 +34,12 @@ def gen_page(template, data=None):
         print("DATA")
         pp.pprint(data)
         if 'username' in session:
-            return render_template(template, user=session["username"], data=data)
+            return render_template(template, user=session["uid"], data=data)
         else:
             return render_template(template, data=data)
 
     if 'username' in session:
-        return render_template(template, user=session["username"])
+        return render_template(template, user=session["uid"])
     return render_template(template)
 
 # Load User Table into variable
@@ -239,7 +239,7 @@ def utility_processor():
         # This probably needs optimizing
         for user in userdb:
             if user[0] == uid:
-                return user[1]
+                return "%s (%s)" % (user[1], user[2])
     return dict(uid_to_user=uid_to_user)
 
 if __name__ == "__main__":
diff --git a/templates/add_quote.html b/templates/add_quote.html
index ba7bfef..ca74781 100644
--- a/templates/add_quote.html
+++ b/templates/add_quote.html
@@ -15,7 +15,7 @@
     <label for="user">User:</label>
     <select class="form-control" id="user" name="user">
 {% for user in data %}
-      <option value="{{ user[0] }}">{{ user[1] }}</option>
+      <option value="{{ user[0] }}">{{ uid_to_user(user[0]) }}</option>
 {% endfor %}
     </select>
   </div>
diff --git a/templates/layout.html b/templates/layout.html
index 77c54c2..ea11ba9 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -33,7 +33,7 @@
         <a href="logout" class="btn btn-primary navbar-btn navbar-right "role="button" ><span class="glyphicon glyphicon-log-out"></span> Sign Out</a>     
         <a href="resetpass" class="btn btn-primary navbar-btn navbar-right "role="button" ><span class="glyphicon glyphicon-wrench"></span></a>
         <ul class="nav navbar-nav navbar-right">
-          <li class="navbar-text">Hello <b> {{ user }}!</b></li>
+          <li class="navbar-text">Hello <b> {{ uid_to_user(user) }}!</b></li>
         </ul>
     {% else %}
         <a href="login" class="btn btn-primary navbar-btn navbar-right "role="button"><span class="glyphicon glyphicon-log-in"></span> Login</a>