diff --git a/scripts/install b/scripts/install
index 5a73bec..ccff4b9 100755
--- a/scripts/install
+++ b/scripts/install
@@ -116,10 +116,11 @@ ynh_add_fpm_config
 #=================================================
 ynh_script_progression --message="Creating a data directory..." --weight=1
 
-datadir=/home/yunohost.app/limesurvey
-ynh_app_setting_set --app=$app --key=datadir --value=$datadir/upload
+datadir=/home/yunohost.app/limesurvey/upload
+ynh_app_setting_set --app=$app --key=datadir --value=$datadir
 mkdir -p $datadir
-mv "$final_path/upload" $datadir/upload
+# Remove upload if empty
+rmdir $datadir && mv "$final_path/upload" $datadir || true
 chown -R $app:www-data "$datadir"
 chmod -R o-rwx "$datadir"
 
@@ -158,7 +159,7 @@ ynh_secure_remove --file=./data.sql
 # Add nice themes
 #=================================================
 
-ynh_setup_source "$final_path/upload/templates/libreform" libreform
+#ynh_setup_source "$datadir/upload/templates/libreform" libreform
 #ynh_setup_source "$final_path/upload/templates/librepoll" librepoll
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index eb1a416..d7e4ebe 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -66,10 +66,11 @@ fi
 
 # If datadir doesn't exist, create it
 if [ -z "$datadir" ]; then
-   datadir=/home/yunohost.app/$app
-   ynh_app_setting_set --app=$app --key=datadir --value=$datadir/upload
+   datadir=/home/yunohost.app/$app/upload
+   ynh_app_setting_set --app=$app --key=datadir --value=$datadir
    mkdir -p $datadir
-   mv "$final_path/upload" $datadir/upload
+    # Remove upload if empty
+    rmdir $datadir && mv "$final_path/upload" $datadir || true
    chown -R $app:www-data "$datadir"
    chmod -R o-rwx "$datadir"
 fi