diff --git a/Dockerfile b/Dockerfile
index 528955341f..5a55179b40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -97,9 +97,6 @@ ENV WEBWORK_ROOT=$APP_ROOT/webwork2 \
 
 # Phase 3 - Ubuntu 20.04 base image + required packages
 
-# Packages changes/added for ubuntu 20.04:
-#       libcgi-pm-perl (for CGI::Cookie), libdbd-mariadb-perl
-
 # Do NOT include "apt-get -y upgrade"
 # see: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/
 
@@ -182,6 +179,7 @@ RUN apt-get update \
 	libjson-maybexs-perl \
 	libcpanel-json-xs-perl \
 	libyaml-libyaml-perl \
+	libemail-stuffer-perl \
 	make \
 	netpbm \
 	patch \
diff --git a/DockerfileStage1 b/DockerfileStage1
index 24355a94c4..34535f0e21 100644
--- a/DockerfileStage1
+++ b/DockerfileStage1
@@ -16,9 +16,6 @@ ENV DEBIAN_FRONTEND=noninteractive \
 
 # Phase 2 - Ubuntu 20.04 base image + required packages
 
-# Packages changes/added for ubuntu 20.04:
-#       libcgi-pm-perl (for CGI::Cookie), libdbd-mariadb-perl
-
 # Do NOT include "apt-get -y upgrade"
 # see: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/
 
@@ -101,6 +98,7 @@ RUN apt-get update \
 	libjson-maybexs-perl \
 	libcpanel-json-xs-perl \
 	libyaml-libyaml-perl \
+	libemail-stuffer-perl \
 	make \
 	netpbm \
 	patch \
diff --git a/docker-config/docker-entrypoint.sh b/docker-config/docker-entrypoint.sh
index 7364c5c834..1a094fe9d3 100755
--- a/docker-config/docker-entrypoint.sh
+++ b/docker-config/docker-entrypoint.sh
@@ -100,7 +100,7 @@ if [ "$1" = 'apache2' ]; then
 
     echo "check admin course and admin tables"
     wait_for_db
-    ADMIN_TABLE_EXISTS=`mysql -u $WEBWORK_DB_USER  -p$WEBWORK_DB_PASSWORD -B -N -h $WEBWORK_DB_HOST -e "select count(*) from information_schema.tables where table_schema='webwork' and table_name = 'admin_user';" 
+    ADMIN_TABLE_EXISTS=`mysql -u $WEBWORK_DB_USER  -p$WEBWORK_DB_PASSWORD -B -N -h $WEBWORK_DB_HOST -e "select count(*) from information_schema.tables where table_schema='webwork' and table_name = 'admin_user';"`
     if [ ! -d "$APP_ROOT/courses/admin" ]; then
         newgrp www-data
         umask 2