Fixes retry for email block and adds default property values for creds