diff --git a/actions/owncloud-setup b/actions/owncloud-setup
index e5c8eb44f..01352a8b6 100755
--- a/actions/owncloud-setup
+++ b/actions/owncloud-setup
@@ -23,10 +23,10 @@ while [ "$1" ] ; do
 	    ;;
 	status)
 	    printstatus() {
-		if $2 ; then
-		    echo $1
+		if "$2" ; then
+		    echo "$1"
 		else
-		    echo no$1
+		    echo no"$1"
 		fi
 	    }
 	    printstatus enable $owncloud_enable_cur
diff --git a/actions/xmpp-register b/actions/xmpp-register
index 88c7fa26f..07068b49e 100755
--- a/actions/xmpp-register
+++ b/actions/xmpp-register
@@ -1,2 +1,2 @@
 #!/bin/sh
-ejabberdctl register $1 `hostname` $2
+ejabberdctl register "$1" `hostname` "$2"
diff --git a/actions/xmpp-setup b/actions/xmpp-setup
index 6c5d0c4fc..9a9e910ad 100755
--- a/actions/xmpp-setup
+++ b/actions/xmpp-setup
@@ -22,10 +22,10 @@ while [ "$1" ] ; do
             ;;
         status)
             printstatus() {
-                if $2 ; then
-                    echo $1
+                if "$2" ; then
+                    echo "$1"
                 else
-                    echo no$1
+                    echo no"$1"
                 fi
             }
             printstatus inband_enable $xmpp_inband_enable_cur