diff --git a/hooks/post_user_create b/hooks/post_user_create
index 24ebf8c..f215f00 100644
--- a/hooks/post_user_create
+++ b/hooks/post_user_create
@@ -2,5 +2,4 @@
 
 user=$1
 
-sudo mkdir -p /home/$user
 sudo setfacl -m g:#GROUP#:rwx /home/$user
diff --git a/scripts/install b/scripts/install
index 6900ed2..0b2aac1 100755
--- a/scripts/install
+++ b/scripts/install
@@ -183,6 +183,10 @@ exec_occ ldap:test-config \'\' \
 if [ $user_home -eq 1 ]; then
     exec_occ app:enable files_external
     create_external_storage "/home/\$user" "Home"
+    # Iterate over users to extend their home folder permissions
+    for u in $(ynh_user_list); do
+        setfacl -m g:$app:rwx "/home/$u" || true
+    done
 fi
 
 #=================================================
@@ -265,13 +269,6 @@ find ${datadir}/ -type d -print0 | xargs -0 chmod 0750
 chmod 640 "${final_path}/config/config.php"
 chmod 755 /home/yunohost.app
 
-# Iterate over users to extend their home folder permissions - for the external
-# storage plugin usage - and create relevant Nextcloud directories
-for u in $(ynh_user_list); do
-    mkdir -p "${datadir}/${u}"
-    setfacl -m g:$app:rwx "/home/$u" || true
-done
-
 #=================================================
 # SETUP LOGROTATE
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index faeaf86..e1901b8 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -271,6 +271,10 @@ if [ $user_home -eq 1 ]; then
     exec_occ files_external:list --output=json \
 	| grep -q '"storage":"\\\\OC\\\\Files\\\\Storage\\\\Local"' \
 	|| create_external_storage "/home/\$user" "Home"
+    # Iterate over users to extend their home folder permissions
+    for u in $(ynh_user_list); do
+      setfacl -m g:$app:rwx "/home/$u" || true
+    done
 fi
 
 #=================================================
@@ -329,13 +333,6 @@ find ${datadir}/ -type d -print0 | xargs -0 chmod 0750
 chmod 640 "${final_path}/config/config.php"
 chmod 755 /home/yunohost.app
 
-# Iterate over users to extend their home folder permissions - for the external
-# storage plugin usage - and create relevant Nextcloud directories
-for u in $(ynh_user_list); do
-    mkdir -p "${datadir}/${u}"
-    setfacl -m g:$app:rwx "/home/$u" || true
-done
-
 #=================================================
 # WARNING ABOUT THIRD-PARTY APPS
 #=================================================