diff --git a/debian/changelog b/debian/changelog
index 3e889a4..f981f6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+calamares-settings-ubuntu (17) UNRELEASED; urgency=medium
+
+  * Add a minimum password strength requirement.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 10 Aug 2018 13:13:43 -0500
+
 calamares-settings-ubuntu (16) cosmic; urgency=medium
 
   * Enable automirror by default.
diff --git a/debian/control b/debian/control
index 2f116ab..217e456 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,9 @@ Vcs-Browser: https://git.launchpad.net/ubuntu-calamares-settings
 
 Package: calamares-settings-lubuntu
 Architecture: all
-Depends: calamares-settings-ubuntu-common (= ${binary:Version}), ${misc:Depends}
+Depends: calamares-settings-ubuntu-common (= ${binary:Version}),
+         libpwquality-dev,
+         ${misc:Depends}
 Description: Lubuntu Calamares Settings and Branding
  This package contains the Calamares settings and branding for Lubuntu Next.
 
diff --git a/lubuntu/modules/users.conf b/lubuntu/modules/users.conf
index f12040a..3ac78ed 100644
--- a/lubuntu/modules/users.conf
+++ b/lubuntu/modules/users.conf
@@ -1,7 +1,7 @@
 ---
 doAutologin: false
 setRootPassword: false
-sudoersGroup:    sudo
+sudoersGroup: sudo
 defaultGroups:
     - adm
     - lpadmin
@@ -12,6 +12,12 @@ defaultGroups:
     - storage
     - sudo
     - audio
+passwordRequirements:
+    minLength: 5
+    maxLength: 200
+    libpwquality:
+        - minlen=0
+        - minclass=0
 # Explicitly set the shell instead of deferring to Calamares. We have a platform
 # expectation derived from Ubuntu here.
 userShell: /bin/bash