[PATCH 0/5] Credential asking cleanup follow-up