clean up user check.
Merge branch 'logout_fix'
address log out errors on punting user.