diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh
index 72671547..6e8ba07b 100644
--- a/target/start-mailserver.sh
+++ b/target/start-mailserver.sh
@@ -247,7 +247,7 @@ else
 fi
 
 # Fix permissions, but skip this if 3 levels deep the user id is already set
-if [ `find /var/mail -maxdepth 3 \! -user 5000 | grep -c .` != 0 ]; then
+if [ `find /var/mail -maxdepth 3 -a \( \! -user 5000 -o \! -group 5000 \) | grep -c .` != 0 ]; then
   echo "Fixing /var/mail permissions"
   chown -R 5000:5000 /var/mail
 else