diff --git a/roles/sap_swpm/tasks/post_install.yml b/roles/sap_swpm/tasks/post_install.yml
index 4e0d39968..40dab5e16 100644
--- a/roles/sap_swpm/tasks/post_install.yml
+++ b/roles/sap_swpm/tasks/post_install.yml
@@ -46,7 +46,8 @@
     /usr/sap/{{ sap_swpm_sid }}/hdbclient/hdbuserstore \
     SET DEFAULT \
     {{ sap_swpm_db_host }}:3{{ sap_swpm_db_instance_nr }}13@{{ sap_swpm_db_sid }} \
-    {{ sap_swpm_db_schema_abap }} '{{ sap_swpm_db_system_password }}'
+    {{ sap_swpm_db_schema_abap }} "{% if sap_swpm_db_schema_abap_password is defined %}{{ sap_swpm_db_schema_abap_password }}{% else %}
+    {{ sap_swpm_db_system_password }}{% endif %}"
   args:
     executable: /bin/bash
   become: true