US5987: Fixing the signature validation logic