diff --git a/debian/changelog b/debian/changelog
index 575652a..39f1f16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ calamares-settings-ubuntu (1:21.04.1) hirsute; urgency=medium
 
   [ Dan Simmons ]
   * Welcome to the Hirsute Hippo!
+  * Set sambashare user as a system user. (LP: #1857364)
 
  -- apt-ghetto <apt-ghetto@lubuntu.me>  Sat, 24 Oct 2020 10:47:15 +0200
 
diff --git a/lubuntu/modules/users.conf b/lubuntu/modules/users.conf
index 3798937..1c79f74 100644
--- a/lubuntu/modules/users.conf
+++ b/lubuntu/modules/users.conf
@@ -8,7 +8,9 @@ defaultGroups:
     - dip
     - lpadmin
     - plugdev
-    - sambashare
+    - name: sambashare
+      must_exist: false
+      system: true
     - sudo
 passwordRequirements:
     minLength: 0
diff --git a/ubuntustudio/modules/users.conf b/ubuntustudio/modules/users.conf
index e911509..326ac4b 100644
--- a/ubuntustudio/modules/users.conf
+++ b/ubuntustudio/modules/users.conf
@@ -8,7 +8,9 @@ defaultGroups:
     - dip
     - lpadmin
     - plugdev
-    - sambashare
+    - name: sambashare
+      must_exist: false
+      system: true
     - sudo
     - audio
 passwordRequirements: