Fixing more currentUser bugs