diff --git a/management/server/account.go b/management/server/account.go
index 192180406..f5a5a2339 100644
--- a/management/server/account.go
+++ b/management/server/account.go
@@ -3,7 +3,6 @@ package server
 import (
 	"context"
 	"fmt"
-	"github.com/netbirdio/netbird/management/server/http/middleware"
 	"math/rand"
 	"net"
 	"net/netip"
@@ -120,10 +119,8 @@ type DefaultAccountManager struct {
 	// singleAccountModeDomain is a domain to use in singleAccountMode setup
 	singleAccountModeDomain string
 	// dnsDomain is used for peer resolution. This is appended to the peer's name
-	dnsDomain          string
-	peerLoginExpiry    Scheduler
-	jwtMiddleware      *middleware.JWTMiddleware
-	jwtClaimsExtractor *jwtclaims.ClaimsExtractor
+	dnsDomain       string
+	peerLoginExpiry Scheduler
 }
 
 // Settings represents Account settings structure that can be modified via API and Dashboard
diff --git a/management/server/peer.go b/management/server/peer.go
index 68830d0b9..823fa59e3 100644
--- a/management/server/peer.go
+++ b/management/server/peer.go
@@ -682,7 +682,7 @@ func (am *DefaultAccountManager) LoginPeer(login PeerLogin) (*Peer, error) {
 	if peer.UserID != "" && (expired || peer.Status.LoginExpired) {
 		if login.UserID == "" {
 			// absence of a user ID indicates that JWT wasn't provided.
-			peer, err = am.markPeerLoginExpired(peer, account, true)
+			_, err = am.markPeerLoginExpired(peer, account, true)
 			if err != nil {
 				return nil, err
 			}