Added a scope for active users
Add markup to emails