fix to allow no passing in of current_user