Minor upgrades, made it work without email settingsy