diff --git a/doc/xml/user-guide.xml b/doc/xml/user-guide.xml
index ed3b907ff..d44ebda5d 100644
--- a/doc/xml/user-guide.xml
+++ b/doc/xml/user-guide.xml
@@ -820,16 +820,16 @@
 
         <host-add id="{[host-pg1-id]}" name="{[host-pg1]}" user="{[host-pg1-user]}" image="{[host-pg1-image]}" os="{[os-type]}" mount="{[host-pg1-mount]}" option="{[host-option]}"/>
 
-        <execute-list if="{[pg-version]} >= 11" host="{[host-pg1]}">
+        <!-- <execute-list if="{[pg-version]} >= 11" host="{[host-pg1]}">
             <title>Create <user>{[br-user]}</user> user</title>
 
             <execute if="{[os-type-is-debian]}" user="root">
-                <exe-cmd>adduser --ingroup {[pg-group]} --disabled-password --gecos "" {[br-user]}</exe-cmd>
+                <exe-cmd>adduser {[dash]}-ingroup {[pg-group]} {[dash]}-disabled-password {[dash]}-gecos "" {[br-user]}</exe-cmd>
             </execute>
             <execute if="{[os-type-is-centos]}" user="root">
                 <exe-cmd>adduser -g{[pg-group]} -n {[br-user]}</exe-cmd>
             </execute>
-        </execute-list>
+        </execute-list> -->
 
         <block id="br-install">
             <block-variable-replace key="br-install-host">{[host-pg1]}</block-variable-replace>
@@ -2296,7 +2296,7 @@
 
                 <backrest-config-option section="demo" key="pg1-path">{[pg-path]}</backrest-config-option>
                 <backrest-config-option section="demo" key="pg1-host">{[host-pg1]}</backrest-config-option>
-                <backrest-config-option if="{[pg-version]} >= 11" section="demo" key="pg1-host-user">{[br-user]}</backrest-config-option>
+                <!-- <backrest-config-option if="{[pg-version]} >= 11" section="demo" key="pg1-host-user">{[br-user]}</backrest-config-option> -->
 
                 <backrest-config-option section="global" key="start-fast">y</backrest-config-option>
                 <backrest-config-option section="global" key="repo1-retention-full">2</backrest-config-option>
@@ -2322,7 +2322,7 @@
 
             <p>Commands are run the same as on a single host configuration except that some commands such as <cmd>backup</cmd> and <cmd>expire</cmd> are run from the <host>repository</host> host instead of the <host>database</host> host.</p>
 
-            <execute-list if="{[pg-version]} >= 11" host="{[host-pg1]}">
+            <!-- <execute-list if="{[pg-version]} >= 11" host="{[host-pg1]}">
                 <title>Set permissions required for backup</title>
 
                 <execute user="postgres">
@@ -2336,7 +2336,7 @@
                             grant execute on function pg_create_restore_point(text) to pgbackrest;"
                     </exe-cmd>
                 </execute>
-            </execute-list>
+            </execute-list> -->
 
             <p if="'{[s3-all]}' eq 'y'">Configure S3-compatible object store if required.</p>
 
@@ -2565,16 +2565,16 @@
 
             <host-add id="{[host-pg2-id]}" name="{[host-pg2]}" user="{[host-pg2-user]}" image="{[host-pg2-image]}" os="{[os-type]}" mount="{[host-pg2-mount]}" option="{[host-option]}"/>
 
-            <execute-list if="{[pg-version]} >= 11" host="{[host-pg2]}">
+            <!-- <execute-list if="{[pg-version]} >= 11" host="{[host-pg2]}">
                 <title>Create <user>{[br-user]}</user> user</title>
 
                 <execute if="{[os-type-is-debian]}" user="root">
-                    <exe-cmd>adduser --ingroup {[pg-group]} --disabled-password --gecos "" {[br-user]}</exe-cmd>
+                    <exe-cmd>adduser {[dash]}-ingroup {[pg-group]} {[dash]}-disabled-password {[dash]}-gecos "" {[br-user]}</exe-cmd>
                 </execute>
                 <execute if="{[os-type-is-centos]}" user="root">
                     <exe-cmd>adduser -g{[pg-group]} -n {[br-user]}</exe-cmd>
                 </execute>
-            </execute-list>
+            </execute-list> -->
 
             <block id="br-install">
                 <block-variable-replace key="br-install-host">{[host-pg2]}</block-variable-replace>
@@ -3087,8 +3087,8 @@
 
             <backrest-config-option section="demo" key="pg2-path">{[pg-path]}</backrest-config-option>
             <backrest-config-option section="demo" key="pg2-host">{[host-pg2]}</backrest-config-option>
-            <backrest-config-option if="{[pg-version]} >= 11" section="demo"
-                key="pg2-host-user">{[br-user]}</backrest-config-option>
+            <!-- <backrest-config-option if="{[pg-version]} >= 11" section="demo"
+                key="pg2-host-user">{[br-user]}</backrest-config-option> -->
 
             <backrest-config-option section="global" key="backup-standby">y</backrest-config-option>
         </backrest-config>