fix current user check