Fix keychain credential :external_id bug
#4177
+365
−2
Draft