diff --git a/docs/customization/issues-in-log.md b/docs/customization/issues-in-log.md
index 5cb19fa6..e11f8910 100644
--- a/docs/customization/issues-in-log.md
+++ b/docs/customization/issues-in-log.md
@@ -8,4 +8,7 @@ To use it, you can add the following line in your `dbt_project.yml`:
 on-run-end: "{{ dbt_project_evaluator.print_dbt_project_evaluator_issues() }}"
 ```
 
-The macro accepts a parameter to pick between 2 types of formatting, `format='table'` (default) or `format='csv'`
+The macro accepts two parameters:
+
+- to pick between 2 types of formatting, set `format='table'` (default) or `format='csv'`
+- to add quotes to the database and schema (default = no quote), set ``quote='`'`` or `quote='"'`
diff --git a/macros/on-run-end/print_dbt_project_evaluator_issues.sql b/macros/on-run-end/print_dbt_project_evaluator_issues.sql
index 802c926c..dff316f4 100644
--- a/macros/on-run-end/print_dbt_project_evaluator_issues.sql
+++ b/macros/on-run-end/print_dbt_project_evaluator_issues.sql
@@ -1,4 +1,4 @@
-{% macro print_dbt_project_evaluator_issues(format='table') %}
+{% macro print_dbt_project_evaluator_issues(format='table', quote="") %}
 
   {%- if flags.WHICH in ["build","test"] -%}
     {{ print("\n### List of issues raised by dbt_project_evaluator ###") }}
@@ -13,8 +13,8 @@
 
         {% set model_details = graph["nodes"][unique_id_model_checked] %}
         {% set name_model_checked = model_details.alias %}
-        {% set model_schema = model_details.schema %}
-        {% set model_database = model_details.database %}
+        {% set model_schema = quote ~ model_details.schema ~ quote %}
+        {% set model_database = quote ~ model_details.database ~ quote if model_details.database  else None %}
         {% set db_schema = model_database ~ "." ~ model_schema if model_database else model_schema %}
 
         {% set sql_statement %}