Merge "Only try to auth if there's a notification"