diff --git a/images/imap-download/Dockerfile b/images/imap-download/Dockerfile
index f17c485..9e8c90c 100644
--- a/images/imap-download/Dockerfile
+++ b/images/imap-download/Dockerfile
@@ -7,7 +7,9 @@ RUN install_packages ca-certificates fetchmail procmail inotify-tools mpack
 RUN mkdir /srv/home \
 	&& ln -s /mnt/fetchmailrc /srv/home/.fetchmailrc \
 	&& mkdir /tmp/maildir \
-	&& useradd --system --home=/srv/home --uid=10000 --gid=10000 fetchmail
+	&& groupmod -g 10000 fetchmail \
+	&& usermod --uid 10000 --gid 10000 --home=/srv/home --uid=10000 --gi=10000 fetchmail \
+	&& chown fetchmail:fetchmail /srv/home
 
 ENV HOME /srv/home