diff --git a/prosody/rootfs/etc/services.d/70-register-setup/run b/prosody/rootfs/etc/services.d/70-register-setup/run
index 9703afa..0de71a2 100755
--- a/prosody/rootfs/etc/services.d/70-register-setup/run
+++ b/prosody/rootfs/etc/services.d/70-register-setup/run
@@ -104,18 +104,15 @@ fi
 
 # Register Jibri recorder and Jigasi transcriber in client mode only
 if [[ "$PROSODY_MODE" == "client" ]]; then
-    if [[ ! -z $JIBRI_RECORDER_PASSWORD ]]; then
-        OLD_JIBRI_RECORDER_PASSWORD=passw0rd
-        if [[ "$JIBRI_RECORDER_PASSWORD" == "$OLD_JIBRI_RECORDER_PASSWORD" ]]; then
-            echo '[register-setup] FATAL ERROR: Jibri recorder password must be changed, check the README'
-            exit 1
-        fi
-        echo "[register-setup] Registering Jibri recorder user..."
-        OUTPUT=$(prosodyctl --config $PROSODY_CFG shell user create $JIBRI_RECORDER_USER@$XMPP_HIDDEN_DOMAIN $JIBRI_RECORDER_PASSWORD 2>&1)
-        if [ $? -eq 0 ]; then
-            echo "[register-setup] Jibri recorder user registered successfully"
-        else
-            echo "[register-setup] Jibri recorder user registration output: $OUTPUT"
+    if [[ "$(echo "$ENABLE_RECORDING" | tr '[:upper:]' '[:lower:]')" == "true" ]] || [[ "$ENABLE_RECORDING" == "1" ]]; then
+        if [[ ! -z $JIBRI_RECORDER_PASSWORD ]]; then
+            echo "[register-setup] Registering Jibri recorder user..."
+            OUTPUT=$(prosodyctl --config $PROSODY_CFG shell user create $JIBRI_RECORDER_USER@$XMPP_HIDDEN_DOMAIN $JIBRI_RECORDER_PASSWORD 2>&1)
+            if [ $? -eq 0 ]; then
+                echo "[register-setup] Jibri recorder user registered successfully"
+            else
+                echo "[register-setup] Jibri recorder user registration output: $OUTPUT"
+            fi
         fi
     fi