diff --git a/cmd/rdpgw/protocol/process.go b/cmd/rdpgw/protocol/process.go
index 0d5e336..bd8da3c 100644
--- a/cmd/rdpgw/protocol/process.go
+++ b/cmd/rdpgw/protocol/process.go
@@ -136,7 +136,7 @@ func (p *Processor) Process(ctx context.Context) error {
 			// p.tunnel.User.UserName() (username)
 			clientIP := p.tunnel.User.GetAttribute(identity.AttrClientIp) // Extract client IP
 			sessionID := p.tunnel.User.SessionId()
-			username := p.tunnel.User.Email()                         // Extract username
+			username := p.tunnel.User.UserName()                         // Extract username
 
 			log.Printf(
 				"Establishing RDP Connection Details / ID: %s / ClientIP: %s / HostIP: %s / Username: %s",
diff --git a/cmd/rdpgw/web/oidc.go b/cmd/rdpgw/web/oidc.go
index 861b3d5..0df2bc9 100644
--- a/cmd/rdpgw/web/oidc.go
+++ b/cmd/rdpgw/web/oidc.go
@@ -99,7 +99,7 @@ func (h *OIDC) HandleCallback(w http.ResponseWriter, r *http.Request) {
 }
 
 func findUsernameInClaims(data map[string]interface{}) string {
-	candidates := []string{"preferred_username", "unique_name", "upn", "username"}
+	candidates := []string{"email"}
 	for _, claim := range candidates {
 		userName, found := data[claim].(string)
 		if found {