Added in the event subscriber for local logged in users.
A few tiny tidy-ups