diff --git a/start-mailserver.sh b/start-mailserver.sh
index ce82eb33..8b9c89b5 100644
--- a/start-mailserver.sh
+++ b/start-mailserver.sh
@@ -25,7 +25,12 @@ if [ -f /tmp/postfix/accounts.cf ]; then
     echo "${pass}" | userdbpw -md5 | userdb ${login} set systempw
     echo "${pass}" | saslpasswd2 -p -c -u ${domain} ${login}
     mkdir -p /var/mail/${domain}
-    maildirmake /var/mail/${domain}/${user}
+    if [ -d "/var/mail/${domain}/${user}" ]; then
+      # Directory already present
+      echo "Directory present"
+    else
+      maildirmake "/var/mail/${domain}/${user}"
+    fi
     echo ${domain} >> /tmp/vhost.tmp
   done < /tmp/postfix/accounts.cf
   makeuserdb