issue #20890: oauth usability tweaks