diff --git a/debian/changelog b/debian/changelog
index e251501..9d7f1bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 calamares-settings-ubuntu (11) UNRELEASED; urgency=medium
 
   * Add a machineid file.
+  * Ensure that /bin/bash is always the default shell.
 
  -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 20 Jul 2018 09:43:15 -0500
 
diff --git a/lubuntu/modules/users.conf b/lubuntu/modules/users.conf
index d9eb9d1..f12040a 100644
--- a/lubuntu/modules/users.conf
+++ b/lubuntu/modules/users.conf
@@ -12,3 +12,6 @@ defaultGroups:
     - storage
     - sudo
     - audio
+# Explicitly set the shell instead of deferring to Calamares. We have a platform
+# expectation derived from Ubuntu here.
+userShell: /bin/bash