User Auth Fixes