diff --git a/spritz/misc/spritz b/spritz/misc/spritz
index 4148ecf54..189743892 100755
--- a/spritz/misc/spritz
+++ b/spritz/misc/spritz
@@ -1,6 +1,6 @@
 #!/usr/bin/python -O
 import sys, os
-spritz_path = " python /usr/lib/entropy/spritz/spritz.py"
+spritz_path = " /usr/lib/entropy/spritz/spritz.py " + ' '.join(sys.argv[1:])
 su_cmd = "xterm -e \"su -c '"+spritz_path+"'\""
 if "--debug" in sys.argv:
     os.environ['SPRITZ_DEBUG'] = "1"
@@ -29,11 +29,11 @@ def setup_env():
         for item in path:
             itempath = os.path.join(item,'kdesu')
             if os.access(itempath,os.X_OK):
-                su_cmd = itempath+spritz_path
+                su_cmd = itempath+' "'+spritz_path+'"'
                 break
     else:
         if os.access('/usr/bin/gksu',os.X_OK):
-            su_cmd = '/usr/bin/gksu'+spritz_path
+            su_cmd = '/usr/bin/gksu "'+spritz_path+'"'