Cherry-pick: Separate IDs for logout-links