diff --git a/assets/tpl/user_index.html b/assets/tpl/user_index.html
index 4da4fae..1968aba 100644
--- a/assets/tpl/user_index.html
+++ b/assets/tpl/user_index.html
@@ -34,6 +34,7 @@
                     <th scope="col"><a href="?sort=pubKey">Public Key <i class="fa fa-fw {{.Session.GetSortIcon "userpeers" "pubKey"}}"></i></a></th>
                     <th scope="col"><a href="?sort=mail">E-Mail <i class="fa fa-fw {{.Session.GetSortIcon "userpeers" "mail"}}"></i></a></th>
                     <th scope="col"><a href="?sort=ip">IP's <i class="fa fa-fw {{.Session.GetSortIcon "userpeers" "ip"}}"></i></a></th>
+                    <th scope="col"><a href="?sort=device">Interface <i class="fa fa-fw {{.Session.GetSortIcon "userpeers" "device"}}"></i></a></th>
                     <th scope="col"><a href="?sort=handshake">Handshake <i class="fa fa-fw {{.Session.GetSortIcon "userpeers" "handshake"}}"></i></a></th>
                     {{if eq $.UserManagePeers true}}
                     <th scope="col"></th>
@@ -53,6 +54,7 @@
                         <td>{{$p.PublicKey}}</td>
                         <td>{{$p.Email}}</td>
                         <td>{{$p.IPsStr}}</td>
+                        <td>{{$p.DeviceName}}</td>
                         <td><span data-toggle="tooltip" data-placement="left" title="" data-original-title="{{$p.LastHandshakeTime}}">{{$p.LastHandshake}}</span></td>
                         {{if eq $.UserManagePeers true}}
                         <td>
diff --git a/internal/server/handlers_common.go b/internal/server/handlers_common.go
index 8ccb8a7..c315dcf 100644
--- a/internal/server/handlers_common.go
+++ b/internal/server/handlers_common.go
@@ -128,8 +128,8 @@ func (s *Server) GetUserIndex(c *gin.Context) {
 			s.GetHandleError(c, http.StatusInternalServerError, "sort error", "failed to save session")
 			return
 		}
-		c.Redirect(http.StatusSeeOther, "/admin")
-		return
+		/*c.Redirect(http.StatusSeeOther, "/admin")
+		return*/
 	}
 
 	peers := s.peers.GetSortedPeersForEmail(currentSession.SortedBy["userpeers"], currentSession.SortDirection["userpeers"], currentSession.Email)
diff --git a/internal/wireguard/peermanager.go b/internal/wireguard/peermanager.go
index badf317..d406344 100644
--- a/internal/wireguard/peermanager.go
+++ b/internal/wireguard/peermanager.go
@@ -731,6 +731,9 @@ func sortPeers(sortKey string, sortDirection string, peers []Peer) {
 		case "endpoint":
 			sortValueLeft = peers[i].Endpoint
 			sortValueRight = peers[j].Endpoint
+		case "device":
+			sortValueLeft = peers[i].DeviceName
+			sortValueRight = peers[j].DeviceName
 		case "handshake":
 			if peers[i].Peer == nil {
 				return true