Better handling of accept/dismiss invitation