diff --git a/pepinstaller/preseed/preseed.cfg b/pepinstaller/preseed/preseed.cfg
index b0f76f8..7434622 100644
--- a/pepinstaller/preseed/preseed.cfg
+++ b/pepinstaller/preseed/preseed.cfg
@@ -26,4 +26,7 @@ d-i apt-setup/security_host string security.debian.org
 # Remove popularity-contest
 popularity-contest popularity-contest/participate boolean false
 
-
+### Account setup
+# Skip creation of a root account (normal user account will be able to
+# use sudo).
+d-i passwd/root-login boolean false
diff --git a/pepscripts/07final-cleanup b/pepscripts/07final-cleanup
index 47f7f8e..08bbd9c 100755
--- a/pepscripts/07final-cleanup
+++ b/pepscripts/07final-cleanup
@@ -17,8 +17,7 @@ chroot /target apt purge --autoremove -y \
     connman \
     deluge \
     galculator \
-    raspi-firmware \
-    morph-browser
+    raspi-firmware
 
 # Clean unnecessary files
 rm -r /target/boot/firmware