diff --git a/scripts/cl-setup-taiga.sh b/scripts/cl-setup-taiga.sh
index 9697bda..a39247c 100755
--- a/scripts/cl-setup-taiga.sh
+++ b/scripts/cl-setup-taiga.sh
@@ -1,7 +1,14 @@
 #!/bin/bash
 
+export PATH="/lib/rc/bin:$PATH"
 set -ueo pipefail
 
+show=
+if [[ $# == 1  && $1 == 'show' ]]
+then
+	show='show'
+fi
+
 chown taiga:taiga /var/calculate/ini.env
 su - taiga -c '/var/db/repos/container/scripts/taiga-www-install.sh'
 
@@ -9,10 +16,19 @@ su - taiga -c '/var/db/repos/container/scripts/taiga-www-install.sh'
 
 /var/db/repos/container/scripts/taiga-rabbitmq.sh
 
-/var/db/repos/container/scripts/taiga-www-setup.sh
+/var/db/repos/container/scripts/taiga-www-setup.sh $show
 
 su - taiga -c '/var/db/repos/container/scripts/taiga-www-migrate.sh'
 
-rc-update add taiga
-rc-update -u
-openrc
+
+if [[ ! -e /etc/runlevels/default/taiga ]]
+then
+	rc-update add taiga
+	rc-update -u
+	openrc
+fi
+
+if [[ -z $show ]]
+then
+	einfo "To display configured options, run 'cl-setup show'."
+fi
diff --git a/scripts/taiga-www-setup.sh b/scripts/taiga-www-setup.sh
index 8cab0cc..3bffe36 100755
--- a/scripts/taiga-www-setup.sh
+++ b/scripts/taiga-www-setup.sh
@@ -166,10 +166,8 @@ eend
 einfo 'Setting up configuration files'
 configure_conf
 
-if [[ $# == 0 ]]
+if [[ $# == 1 && $1 == 'show' ]]
 then
-	einfo "To display configured options, run '$0 show'."
-else
 	einfo 'Customized parameters:'
 	show_conf
 fi