diff --git a/cmd/rdpgw/protocol/server.go b/cmd/rdpgw/protocol/server.go
index 2a1c4c8535a23fa8f2f2f8a715abed00c85c5e17..64bca2fa314d90d7e2a8f64e963154313decbe85 100644
--- a/cmd/rdpgw/protocol/server.go
+++ b/cmd/rdpgw/protocol/server.go
@@ -225,10 +225,10 @@ func (s *Server) handshakeRequest(data []byte) (major byte, minor byte, version
 }
 
 func (s *Server) matchAuth(extAuth uint16) (caps uint16, err error) {
-	if s.SmartCardAuth && extAuth & HTTP_EXTENDED_AUTH_SC == 1 {
+	if s.SmartCardAuth {
 		caps = caps | HTTP_EXTENDED_AUTH_SC
 	}
-	if s.TokenAuth && extAuth & HTTP_EXTENDED_AUTH_PAA == 1 {
+	if s.TokenAuth {
 		caps = caps | HTTP_EXTENDED_AUTH_PAA
 	}