Add login rules
Tweak output