diff --git a/docs/en_US/release_notes_3_7.rst b/docs/en_US/release_notes_3_7.rst
index 656b6282a..af9609497 100644
--- a/docs/en_US/release_notes_3_7.rst
+++ b/docs/en_US/release_notes_3_7.rst
@@ -15,5 +15,6 @@ Bug fixes
 *********
 
 | `Bug #3354 <https://redmine.postgresql.org/issues/3354>`_ - Fix handling of array types as inputs to the debugger.
+| `Bug #3599 <https://redmine.postgresql.org/issues/3599>`_ - Run Postfix in the container build so passwords can be reset etc.
 | `Bug #3619 <https://redmine.postgresql.org/issues/3619>`_ - Add titles to the code areas of the Query Tool and Debugger to ensure that panels can be re-docked within them.
 | `Bug #3711 <https://redmine.postgresql.org/issues/3711>`_ - Fix an encoding issue in the query tool.
diff --git a/pkg/docker/Dockerfile b/pkg/docker/Dockerfile
index f36715763..391c75d47 100644
--- a/pkg/docker/Dockerfile
+++ b/pkg/docker/Dockerfile
@@ -36,7 +36,7 @@ RUN LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 make -C /pgadmin4/docs/en_US -f Makefile
 FROM python:3.6-alpine3.7
 
 RUN pip --no-cache-dir install gunicorn
-RUN apk add --no-cache postgresql-client postgresql-libs
+RUN apk add --no-cache postfix postgresql-client postgresql-libs
 
 WORKDIR /pgadmin4
 ENV PYTHONPATH=/pgadmin4
diff --git a/pkg/docker/entrypoint.sh b/pkg/docker/entrypoint.sh
index e69b9d457..041fc690f 100755
--- a/pkg/docker/entrypoint.sh
+++ b/pkg/docker/entrypoint.sh
@@ -16,6 +16,9 @@ if [ ! -f /var/lib/pgadmin/pgadmin4.db ]; then
     python run_pgadmin.py
 fi
 
+# Start Postfix to handle password resets etc.
+/usr/sbin/postfix start
+
 # NOTE: currently pgadmin can run only with 1 worker due to sessions implementation
 # Using --threads to have multi-threaded single-process worker