diff --git a/api/demo/demo-user.py b/api/demo/demo-user.py
index 64f48f9aa06bb9cb406306929d975025ad440c9b..4f8648fb37288ad6ff18d59be88ea3bac207fdcc 100644
--- a/api/demo/demo-user.py
+++ b/api/demo/demo-user.py
@@ -3,4 +3,5 @@ from funkwhale_api.users.models import User
 
 u = User.objects.create(email='demo@demo.com', username='demo', is_staff=True)
 u.set_password('demo')
+u.subsonic_api_token = 'demo'
 u.save()
diff --git a/demo/setup.sh b/demo/setup.sh
index 1d63cc181857cdeca2b579282eff98c816c378f5..b96f517b3a4ba7b69c137fc425aa2c7e912f820a 100644
--- a/demo/setup.sh
+++ b/demo/setup.sh
@@ -5,7 +5,7 @@ demo_path="/srv/funkwhale-demo/demo"
 
 echo 'Cleaning everything...'
 cd $demo_path
-docker-compose down -v || echo 'Nothing to stop'
+/usr/local/bin/docker-compose down -v || echo 'Nothing to stop'
 rm -rf /srv/funkwhale-demo/demo/*
 mkdir -p $demo_path
 echo 'Downloading demo files...'
@@ -23,9 +23,10 @@ echo "DJANGO_SECRET_KEY=demo" >> .env
 echo "DJANGO_ALLOWED_HOSTS=demo.funkwhale.audio" >> .env
 echo "FUNKWHALE_VERSION=$version" >> .env
 echo "FUNKWHALE_API_PORT=5001" >> .env
-
-docker-compose pull
-docker-compose up -d postgres redis
+echo "FEDERATION_MUSIC_NEEDS_APPROVAL=False" >>.env
+echo "PROTECT_AUDIO_FILES=False" >> .env
+/usr/local/bin/docker-compose pull
+/usr/local/bin/docker-compose up -d postgres redis
 sleep 5
-docker-compose run --rm api demo/load-demo-data.sh
-docker-compose up -d
+/usr/local/bin/docker-compose run --rm api demo/load-demo-data.sh
+/usr/local/bin/docker-compose up -d