Issue #20265 Fix OAuth redirect bug when logging in. 

Fix OAuth redirect bug when logging in. 
Fix code/token bcrypt salt bug.
Finish dialog form layout and design so approval screen looks legit and displays the client logo.