diff --git a/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.sh.j2 b/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.sh.j2
index a6b3e134..3f764cc8 100755
--- a/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.sh.j2
+++ b/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.sh.j2
@@ -22,7 +22,9 @@ if [ ! -d "${UHOME}/OwnCloud" ] || ! (
     /usr/bin/find ${UHOME}/OwnCloud/ -maxdepth 0 -user $USER -group ${UGROUP} |
     /bin/grep -q ${UHOME}/OwnCloud/
 ); then
-    mkdir -p ${UHOME}/OwnCloud &&
+    if [ ! -d "${UHOME}/OwnCloud" ]; then
+        mkdir ${UHOME}/OwnCloud
+    fi
     chmod 700 ${UHOME}/OwnCloud &&
     chown $USER:${UGROUP} ${UHOME}/OwnCloud