Match credentials by id or username
Match credentials by id or username

Matching credentials by id allows creating multiple credentials with the
same username.

Change-Id: I71062b45d9dec4ee537eb307a6437cdeffbb1a3a

ibelikov/jimmy