Adjusted online/offline event handling