diff --git a/src/initscripts/packages/wsdd b/src/initscripts/packages/wsdd
index b07fe3ace..e4ae3d298 100644
--- a/src/initscripts/packages/wsdd
+++ b/src/initscripts/packages/wsdd
@@ -38,18 +38,20 @@ ARGS=(
 
 	# Only use IPv4
 	"--ipv4only"
+
+	# Configure the workgroup
+	"--workgroup" "$(testparm -s --parameter-name workgroup 2>/dev/null)"
 )
 
 INTERFACES="--interface ${GREEN_DEV}"
 if [ -n "${BLUE_DEV}" ]; then
         INTERFACES="${INTERFACES} --interface ${BLUE_DEV}"
 fi
-WSDD_WORKGROUP="--workgroup $(/usr/bin/testparm -s --parameter-name workgroup 2>/dev/null)"
 
 case "$1" in
 	start)
 		boot_mesg "Starting wsdd daemon..."
-		loadproc -b -p "${PIDFILE}" /usr/bin/wsdd "${ARGS[@]}" ${INTERFACES} ${WSDD_WORKGROUP}
+		loadproc -b -p "${PIDFILE}" /usr/bin/wsdd "${ARGS[@]}" ${INTERFACES}
 		;;
 
 	stop)