diff --git a/conf/systemd.service b/conf/systemd.service
index ccc4712..11d34f3 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -8,7 +8,7 @@ User=__APP__
 Group=__APP__
 #WorkingDirectory=__FINALPATH__/
 Environment="PATH=__ENV_PATH__"
-#Environment="THELOUNGE_HOME=/home/yunohost.app/__APP__/"
+Environment="THELOUNGE_HOME=/home/yunohost.app/__APP__/"
 Environment="NODE_ENV=production"
 ExecStart=/usr/bin/yarn start
 ProtectSystem=yes
diff --git a/scripts/install b/scripts/install
index 8631305..22a5193 100644
--- a/scripts/install
+++ b/scripts/install
@@ -104,16 +104,16 @@ ynh_add_nginx_config
 #=================================================
 # CREATE DATA DIRECTORY
 #=================================================
-# ynh_script_progression --message="Creating a data directory..."
+ynh_script_progression --message="Creating a data directory..."
 
-# datadir=/home/yunohost.app/$app
-# ynh_app_setting_set --app=$app --key=datadir --value=$datadir
+datadir=/home/yunohost.app/$app
+ynh_app_setting_set --app=$app --key=datadir --value=$datadir
 
-# mkdir -p $datadir
+mkdir -p $datadir
 
-# chmod 750 "$datadir"
-# chmod -R o-rwx "$datadir"
-# chown -R $app:www-data "$datadir"
+chmod 750 "$datadir"
+chmod -R o-rwx "$datadir"
+chown -R $app:www-data "$datadir"
 
 #=================================================
 # SPECIFIC SETUP
@@ -122,7 +122,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Modifying a config file..."
 
-ynh_add_config --template="../conf/config.js" --destination="$final_path/config.js"
+ynh_add_config --template="../conf/config.js" --destination="$datadir/config.js"
 
 #=================================================
 # INSTALL THE LOUNGE