Better handling of user id revocation in UI code