Merge pull request #330 from jtopjian/identity-reauth-fix

Continue reauth fixes