Add userId back to signature of createKeyPair