Fix recurrence of issue with OAuth dialog dismissal