Forgot tenant ID and mandrill stuff

Oh yeah baby!