CredentialMenu: Minor Fixes