Fix current_user check