Add some validation to the credential generator