diff --git a/Dockerfile b/Dockerfile
index 5fa4fe1..30133a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,9 +6,7 @@ RUN export DEBIAN_FRONTEND='noninteractive' && \
     apt-get update -qq && \
     apt-get install -qqy --no-install-recommends samba \
                 $(apt-get -s dist-upgrade|awk '/^Inst.*ecurity/ {print $2}') &&\
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* && \
-    useradd smbuser -M && \
+    useradd -c 'Samba User' -d /tmp -M -r smbuser && \
     sed -i 's|^\(   log file = \).*|\1/dev/stdout|' /etc/samba/smb.conf && \
     sed -i 's|^\(   unix password sync = \).*|\1no|' /etc/samba/smb.conf && \
     sed -i '/Share Definitions/,$d' /etc/samba/smb.conf && \
@@ -22,7 +20,9 @@ RUN export DEBIAN_FRONTEND='noninteractive' && \
     echo '   printing = bsd' >>/etc/samba/smb.conf && \
     echo '   printcap name = /dev/null' >>/etc/samba/smb.conf && \
     echo '   disable spoolss = yes' >>/etc/samba/smb.conf && \
-    echo '' >>/etc/samba/smb.conf
+    echo '' >>/etc/samba/smb.conf && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/*
 COPY samba.sh /usr/bin/
 
 VOLUME ["/etc/samba"]