Merge "Use logout button + owner for max # notifs calc"