some logic changes around sending credentials