diff --git a/src/Toolbar.vue b/src/Toolbar.vue
index e3a6743..254d6a1 100644
--- a/src/Toolbar.vue
+++ b/src/Toolbar.vue
@@ -6,9 +6,12 @@
             </md-button>
         </span>
         <span v-else class="button-spacer">&nbsp;</span>
-        <h2 id="toolbar-title" class="md-title">ibt2</h2>
+        <h2 id="toolbar-title" class="md-title"><router-link :to="{name: 'home'}" class="home-link">ibt2</router-link></h2>
         <span v-if="loggedInUser.username">
-            <md-button id="logged-in-icon" class="md-icon-button" @click="toUserPage()">
+            <md-button v-if="loggedInUser.isAdmin" id="users-icon" class="md-icon-button" @click="toUserPage()">
+                <md-icon>people_outline</md-icon>
+            </md-button>
+            <md-button id="logged-in-icon" class="md-icon-button" @click="toUsersPage()">
                 <md-icon>person_pin</md-icon>
             </md-button>
             <span id="logged-in" class="md-subheading">
@@ -27,7 +30,7 @@
                     <md-input ref="usernameInput" @keyup.enter.native="focusToPassword()" v-model="username" placeholder="username" md-inline />
                 </md-input-container>&nbsp;
                 <span id="password-block">
-                    <md-input-container id="password-input" class="login-input" md-inline>
+                    <md-input-container id="password-input" class="login-input" md-has-password md-inline>
                         <md-input ref="passwordInput" @keyup.enter.native="login()" v-model="password" placeholder="password" type="password" md-line />
                     </md-input-container>
                     <md-button id="login-button" class="md-icon-button" @click="login()">
@@ -87,6 +90,10 @@ export default {
             this.$router.push(this.userUrl);
         },
 
+        toUsersPage() {
+            this.$router.push('/user/');
+        },
+
         focusToLoginForm() {
             this.showLoginForm = true;
             var that = this;
@@ -213,4 +220,9 @@ export default {
     width: 52px;
 }
 
+.home-link {
+    font-weight: bold;
+    color: white !important;
+}
+
 </style>