fix correctly the current-user issue