currentUser fixed