hopefully correcting current user stuff