Fixing automation on first login