Updated email and credential helper.