Fix branch and smtp config