Reverting cookie_name and removing smtp setting