*8386* Reviewer one click access fixes