Fixed email and conf issues