new credentials matcher
Added more security