fix for currentUser missed