diff --git a/cmd/wg-portal/assets/tpl/admin_user_index.gohtml b/cmd/wg-portal/assets/tpl/admin_user_index.gohtml
index c0f2de9..c14501a 100644
--- a/cmd/wg-portal/assets/tpl/admin_user_index.gohtml
+++ b/cmd/wg-portal/assets/tpl/admin_user_index.gohtml
@@ -19,10 +19,10 @@
         </div>
         {{template "prt_flashes.gohtml" .}}
         <div class="mt-4 row">
-            <div class="col-sm-10 col-12">
+            <div class="col-sm-6 col-12">
                 <h2 class="mt-2">All Users</h2>
             </div>
-            <div class="col-sm-2 col-12 text-right">
+            <div class="col-sm-6 col-12 text-end">
                 <a href="/admin/users/create" title="Add a user" class="btn btn-primary"><i class="fa fa-fw fa-plus"></i>M</a>
             </div>
         </div>
@@ -30,17 +30,19 @@
             <table class="table table-sm" id="userTable">
                 <thead>
                 <tr>
-                    <th scope="col"><a href="?sort=email">E-Mail <i class="fa fa-fw {{.Session.GetSortIcon "users" "email"}}"></i></a></th>
-                    <th scope="col"><a href="?sort=lastname">Lastname <i class="fa fa-fw {{.Session.GetSortIcon "users" "lastname"}}"></i></a></th>
-                    <th scope="col"><a href="?sort=firstname">Firstname <i class="fa fa-fw {{.Session.GetSortIcon "users" "firstname"}}"></i></a></th>
-                    <th scope="col"><a href="?sort=source">Source <i class="fa fa-fw {{.Session.GetSortIcon "users" "source"}}"></i></a></th>
-                    <th scope="col"><a href="?sort=admin">Is Admin <i class="fa fa-fw {{.Session.GetSortIcon "users" "admin"}}"></i></a></th>
+                    <th scope="col"><a href="?sort=uid">ID <i class="fa fa-fw {{getSortIcon $.Session "users" "uid"}}"></i></a></th>
+                    <th scope="col"><a href="?sort=email">E-Mail <i class="fa fa-fw {{getSortIcon $.Session "users" "email"}}"></i></a></th>
+                    <th scope="col"><a href="?sort=lastname">Lastname <i class="fa fa-fw {{getSortIcon $.Session "users" "lastname"}}"></i></a></th>
+                    <th scope="col"><a href="?sort=firstname">Firstname <i class="fa fa-fw {{getSortIcon $.Session "users" "firstname"}}"></i></a></th>
+                    <th scope="col"><a href="?sort=source">Source <i class="fa fa-fw {{getSortIcon $.Session "users" "source"}}"></i></a></th>
+                    <th scope="col"><a href="?sort=admin">Is Admin <i class="fa fa-fw {{getSortIcon $.Session "users" "admin"}}"></i></a></th>
                     <th scope="col"></th><!-- Actions -->
                 </tr>
                 </thead>
                 <tbody>
-                {{range $i, $u :=.Users}}
+                {{range $i, $u := $.Users}}
                     <tr id="user-pos-{{$i}}" {{if $u.DeletedAt.Valid}}class="disabled-peer"{{end}}>
+                        <td>{{$u.Identifier}}</td>
                         <td>{{$u.Email}}</td>
                         <td>{{$u.Lastname}}</td>
                         <td>{{$u.Firstname}}</td>
@@ -62,11 +64,7 @@
     </div>
     {{template "prt_footer.gohtml" .}}
     <script src="/js/jquery.min.js"></script>
-    <script src="/js/jquery.easing.js"></script>
-    <script src="/js/popper.min.js"></script>
     <script src="/js/bootstrap.bundle.min.js"></script>
-    <script src="/js/bootstrap-confirmation.min.js"></script>
-    <script src="/js/custom.js"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/cmd/wg-portal/ui/pages_admin_user.go b/cmd/wg-portal/ui/pages_admin_user.go
index 7b5e2a5..c3f35dc 100644
--- a/cmd/wg-portal/ui/pages_admin_user.go
+++ b/cmd/wg-portal/ui/pages_admin_user.go
@@ -9,14 +9,17 @@
 func (h *handler) handleAdminUserIndexGet() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		currentSession := h.session.GetData(c)
+		users, err := h.backend.GetAllUsers()
+		if err != nil {
+			// TODO
+		}
 
 		c.HTML(http.StatusOK, "admin_user_index.gohtml", gin.H{
-			"Route":          c.Request.URL.Path,
-			"Alerts":         h.session.GetFlashes(c),
-			"Session":        currentSession,
-			"Static":         h.getStaticData(),
-			"Interface":      nil, // TODO: load interface specified in the session
-			"InterfaceNames": map[string]string{"wgX": "wgX descr"},
+			"Route":   c.Request.URL.Path,
+			"Alerts":  h.session.GetFlashes(c),
+			"Session": currentSession,
+			"Static":  h.getStaticData(),
+			"Users":   users,
 		})
 	}
 }