Tweak the message format
Don't bother with default creds
Clean up creds properly