diff --git a/docs/Getting Started/Debian/Debian Buster Root on ZFS.rst b/docs/Getting Started/Debian/Debian Buster Root on ZFS.rst
index a91e28a..919a241 100644
--- a/docs/Getting Started/Debian/Debian Buster Root on ZFS.rst	
+++ b/docs/Getting Started/Debian/Debian Buster Root on ZFS.rst	
@@ -881,14 +881,16 @@ Step 6: First Boot
 
 #. Create a user account:
 
-   Replace ``username`` with your desired username::
+   Replace ``YOUR_USERNAME`` with your desired username::
 
-     zfs create rpool/home/username
-     adduser username
+     username=YOUR_USERNAME
 
-     cp -a /etc/skel/. /home/username
-     chown -R username:username /home/username
-     usermod -a -G audio,cdrom,dip,floppy,netdev,plugdev,sudo,video username
+     zfs create rpool/home/$username
+     adduser $username
+
+     cp -a /etc/skel/. /home/$username
+     chown -R $username:$username /home/$username
+     usermod -a -G audio,cdrom,dip,floppy,netdev,plugdev,sudo,video $username
 
 #. Mirror GRUB
 
diff --git a/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS for Raspberry Pi.rst b/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS for Raspberry Pi.rst
index ff56340..3e21b26 100644
--- a/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS for Raspberry Pi.rst	
+++ b/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS for Raspberry Pi.rst	
@@ -595,19 +595,21 @@ Step 5: First Boot
 
 #. Create a user account:
 
-   Replace ``username`` with your desired username::
+   Replace ``YOUR_USERNAME`` with your desired username::
+
+     username=YOUR_USERNAME
 
      UUID=$(dd if=/dev/urandom bs=1 count=100 2>/dev/null |
          tr -dc 'a-z0-9' | cut -c-6)
      ROOT_DS=$(zfs list -o name | awk '/ROOT\/ubuntu_/{print $1;exit}')
      zfs create -o com.ubuntu.zsys:bootfs-datasets=$ROOT_DS \
-         -o canmount=on -o mountpoint=/home/username \
-         rpool/USERDATA/username_$UUID
-     adduser username
+         -o canmount=on -o mountpoint=/home/$username \
+         rpool/USERDATA/${username}_$UUID
+     adduser $username
 
-     cp -a /etc/skel/. /home/username
-     chown -R username:username /home/username
-     usermod -a -G adm,cdrom,dip,lxd,plugdev,sudo username
+     cp -a /etc/skel/. /home/$username
+     chown -R $username:$username /home/$username
+     usermod -a -G adm,cdrom,dip,lpadmin,lxd,plugdev,sambashare,sudo $username
 
 #. Reboot::
 
diff --git a/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS.rst b/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS.rst
index 7139a12..fe221ec 100644
--- a/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS.rst	
+++ b/docs/Getting Started/Ubuntu/Ubuntu 20.04 Root on ZFS.rst	
@@ -1069,19 +1069,21 @@ Step 6: First Boot
 
 #. Create a user account:
 
-   Replace ``username`` with your desired username::
+   Replace ``YOUR_USERNAME`` with your desired username::
+
+     username=YOUR_USERNAME
 
      UUID=$(dd if=/dev/urandom bs=1 count=100 2>/dev/null |
          tr -dc 'a-z0-9' | cut -c-6)
      ROOT_DS=$(zfs list -o name | awk '/ROOT\/ubuntu_/{print $1;exit}')
      zfs create -o com.ubuntu.zsys:bootfs-datasets=$ROOT_DS \
-         -o canmount=on -o mountpoint=/home/username \
-         rpool/USERDATA/username_$UUID
-     adduser username
+         -o canmount=on -o mountpoint=/home/$username \
+         rpool/USERDATA/${username}_$UUID
+     adduser $username
 
-     cp -a /etc/skel/. /home/username
-     chown -R username:username /home/username
-     usermod -a -G adm,cdrom,dip,lpadmin,lxd,plugdev,sambashare,sudo username
+     cp -a /etc/skel/. /home/$username
+     chown -R $username:$username /home/$username
+     usermod -a -G adm,cdrom,dip,lpadmin,lxd,plugdev,sambashare,sudo $username
 
 Step 7: Full Software Installation
 ----------------------------------