Fix currentUser on Canary