diff --git a/lam/lib/lamdaemon.pl b/lam/lib/lamdaemon.pl
index c681ce44..d65ffb1c 100755
--- a/lam/lib/lamdaemon.pl
+++ b/lam/lib/lamdaemon.pl
@@ -25,6 +25,8 @@
 
 use Sys::Syslog;
 
+my $SPLIT_DELIMITER = "###x##y##x###";
+
 # set a known path
 my $path = "";
 if (-d "/sbin") {
@@ -108,7 +110,8 @@ while (1) {
 	my $input = <STDIN>;
 	chop($input);
 	$return = "";
-	@vals = split (' ', $input);
+	logMessage(LOG_ERR, $input);
+	@vals = split ($SPLIT_DELIMITER, $input);
 	# Get user information
 	if (($vals[3] eq 'user') || ($vals[1] eq 'home')) { @user = getpwnam($vals[0]); }
 	else { @user = getgrnam($vals[0]); }
diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc
index ea83406f..19f3314d 100644
--- a/lam/lib/modules/posixAccount.inc
+++ b/lam/lib/modules/posixAccount.inc
@@ -40,7 +40,8 @@
 class posixAccount extends baseModule implements passwordService {
 
 	// Variables
-
+	private static $SPLIT_DELIMITER = "###x##y##x###";
+	
 	/* These two variables keep an array of groups the user is also member of. */
 	private $groups;
 	private $groups_orig;
@@ -575,7 +576,7 @@ class posixAccount extends baseModule implements passwordService {
 					break;
 				}
 			}
-			$result = lamdaemon(array($this->attributes['uid'][0] . " home add 0".$_SESSION['config']->get_scriptRights()), $server);
+			$result = lamdaemon(array(implode(posixAccount::$SPLIT_DELIMITER, array($this->attributes['uid'][0], "home", "add", "0".$_SESSION['config']->get_scriptRights()))), $server);
 			// lamdaemon results
 			if (is_array($result)) {
 				foreach ($result as $singleresult) {
@@ -624,7 +625,7 @@ class posixAccount extends baseModule implements passwordService {
 			}
 			// try to delete directory on all servers
 			for ($i = 0; $i < sizeof($lamdaemonServers); $i++) {
-				$result = lamdaemon(array($this->attributes['uid'][0] . " home rem"), $lamdaemonServers[$i]);
+				$result = lamdaemon(array(implode(posixAccount::$SPLIT_DELIMITER, array($this->attributes['uid'][0], "home", "rem"))), $lamdaemonServers[$i]);
 				// lamdaemon results
 				if (is_array($result)) {
 					foreach ($result as $singleresult) {
@@ -1596,7 +1597,7 @@ class posixAccount extends baseModule implements passwordService {
 		// create home directories
 		elseif ($temp['counter'] < (sizeof($temp['groups']) + sizeof($temp['createHomes']))) {
 			$pos = $temp['createHomes'][$temp['counter'] - sizeof($temp['groups'])];
-			$result = lamdaemon(array($data[$pos][$ids['posixAccount_userName']] . " home add 0".$_SESSION['config']->get_scriptRights()),
+			$result = lamdaemon(array(implode(posixAccount::$SPLIT_DELIMITER, array($data[$pos][$ids['posixAccount_userName']], "home", "add", "0".$_SESSION['config']->get_scriptRights()))),
 				$data[$pos][$ids['posixAccount_createHomeDir']]);
 			$errors = array();
 			if (($result != false) && (sizeof($result) == 1)) {
diff --git a/lam/lib/modules/quota.inc b/lam/lib/modules/quota.inc
index f98ee941..aeb63600 100644
--- a/lam/lib/modules/quota.inc
+++ b/lam/lib/modules/quota.inc
@@ -4,7 +4,7 @@ $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2003 - 2006  Tilo Lutz
-                2007 - 2008  Roland Gruber
+                2007 - 2009  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -38,24 +38,26 @@ $Id$
 * @package modules
 */
 class quota extends baseModule {
+	
+	private static $SPLIT_DELIMITER = "###x##y##x###";
 
 	/** this functin fills the error message array with messages
 	**/
 	function load_Messages() {
-	// error messages for input checks
-	$this->messages['softblock'][0] = array('ERROR', _('Block soft quota'), _('Block soft quota contains invalid characters. Only natural numbers are allowed.'));
-	$this->messages['softblock'][1] = array('ERROR', _('Account %s:') . ' %s', _('Block soft quota contains invalid characters. Only natural numbers are allowed.'));
-	$this->messages['hardblock'][0] = array('ERROR', _('Block hard quota'), _('Block hard quota contains invalid characters. Only natural numbers are allowed.'));
-	$this->messages['hardblock'][1] = array('ERROR', _('Account %s:') . ' %s', _('Block hard quota contains invalid characters. Only natural numbers are allowed.'));
-	$this->messages['softinode'][0] = array('ERROR', _('Inode soft quota'), _('Inode soft quota contains invalid characters. Only natural numbers are allowed.'));
-	$this->messages['softinode'][1] = array('ERROR', _('Account %s:') . ' %s', _('Inode soft quota contains invalid characters. Only natural numbers are allowed.'));
-	$this->messages['hardinode'][0] = array('ERROR', _('Inode hard quota'), _('Inode hard quota contains invalid characters. Only natural numbers are allowed.'));
-	$this->messages['hardinode'][1] = array('ERROR', _('Account %s:') . ' %s', _('Inode hard quota contains invalid characters. Only natural numbers are allowed.'));
-	$this->messages['block_cmp'][0] = array('ERROR', _('Block quota'), _('Block soft quota must be smaller than block hard quota.'));
-	$this->messages['block_cmp'][1] = array('ERROR', _('Account %s:') . ' %s', _('Block soft quota must be smaller than block hard quota.'));
-	$this->messages['inode_cmp'][0] = array('ERROR', _('Inode quota'), _('Inode soft quota must be smaller than inode hard quota.'));
-	$this->messages['inode_cmp'][1] = array('ERROR', _('Account %s:') . ' %s', _('Inode soft quota must be smaller than inode hard quota.'));
-	$this->messages['upload'][0] = array('ERROR', _('Account %s:') . ' %s', _('Quota has wrong format!'));
+		// error messages for input checks
+		$this->messages['softblock'][0] = array('ERROR', _('Block soft quota'), _('Block soft quota contains invalid characters. Only natural numbers are allowed.'));
+		$this->messages['softblock'][1] = array('ERROR', _('Account %s:') . ' %s', _('Block soft quota contains invalid characters. Only natural numbers are allowed.'));
+		$this->messages['hardblock'][0] = array('ERROR', _('Block hard quota'), _('Block hard quota contains invalid characters. Only natural numbers are allowed.'));
+		$this->messages['hardblock'][1] = array('ERROR', _('Account %s:') . ' %s', _('Block hard quota contains invalid characters. Only natural numbers are allowed.'));
+		$this->messages['softinode'][0] = array('ERROR', _('Inode soft quota'), _('Inode soft quota contains invalid characters. Only natural numbers are allowed.'));
+		$this->messages['softinode'][1] = array('ERROR', _('Account %s:') . ' %s', _('Inode soft quota contains invalid characters. Only natural numbers are allowed.'));
+		$this->messages['hardinode'][0] = array('ERROR', _('Inode hard quota'), _('Inode hard quota contains invalid characters. Only natural numbers are allowed.'));
+		$this->messages['hardinode'][1] = array('ERROR', _('Account %s:') . ' %s', _('Inode hard quota contains invalid characters. Only natural numbers are allowed.'));
+		$this->messages['block_cmp'][0] = array('ERROR', _('Block quota'), _('Block soft quota must be smaller than block hard quota.'));
+		$this->messages['block_cmp'][1] = array('ERROR', _('Account %s:') . ' %s', _('Block soft quota must be smaller than block hard quota.'));
+		$this->messages['inode_cmp'][0] = array('ERROR', _('Inode quota'), _('Inode soft quota must be smaller than inode hard quota.'));
+		$this->messages['inode_cmp'][1] = array('ERROR', _('Account %s:') . ' %s', _('Inode soft quota must be smaller than inode hard quota.'));
+		$this->messages['upload'][0] = array('ERROR', _('Account %s:') . ' %s', _('Quota has wrong format!'));
 	}
 
 	/**
@@ -174,7 +176,7 @@ class quota extends baseModule {
 			$temp = explode(":", $lamdaemonServers[$s]);
 			$server = $temp[0];
 			// get quotas
-			$quotas = lamdaemon(array($userName . " quota get " . $this->get_scope()), $server);
+			$quotas = lamdaemon(array(implode(quota::$SPLIT_DELIMITER, array($userName, "quota", "get", $this->get_scope()))), $server);
 			$allQuotas = explode(":", $quotas[0]);
 			array_pop($allQuotas); // remove empty element at the end
 			for ($i = 0; $i < sizeof($allQuotas); $i++) {
@@ -259,7 +261,7 @@ class quota extends baseModule {
 				$quotastring = $quotastring . $this->quota[$server][$i][0] . ',' . $this->quota[$server][$i][2] . ',' . $this->quota[$server][$i][3]
 					. ',' . $this->quota[$server][$i][6] . ',' . $this->quota[$server][$i][7] . ':';
 			}
-			lamdaemon(array($id . " quota set " . $this->get_scope() . " $quotastring\n"), $server);
+			lamdaemon(array(implode(quota::$SPLIT_DELIMITER, array($id, "quota", "set", $this->get_scope(), "$quotastring\n"))), $server);
 		}
 	}
 
@@ -298,7 +300,7 @@ class quota extends baseModule {
 				$quotastring = $quotastring . $this->quota[$server][$i][0] . ',0,0,0,0:';
 				$i++;
 				}
-			lamdaemon(array($id . " quota set " . $this->get_scope() . " $quotastring\n"), $server);
+			lamdaemon(array(implode(quota::$SPLIT_DELIMITER, array($id, "quota", "set", $this->get_scope(), "$quotastring\n"))), $server);
 		}
 		return true;
 	}
@@ -456,7 +458,7 @@ class quota extends baseModule {
 			if (isset($temp[1])) $description = $temp[1];
 
 			// Get quotas
-			$quotas = lamdaemon(array("+ quota get " . $this->get_scope()), $server);
+			$quotas = lamdaemon(array(implode(quota::$SPLIT_DELIMITER, array("+", "quota", "get", $this->get_scope()))), $server);
 			$dirs = explode(":", $quotas[0]);
 			array_pop($dirs); // remove empty element at the end
 			for ($i = 0; $i < sizeof($dirs); $i++) {
@@ -510,7 +512,7 @@ class quota extends baseModule {
 			$server = $temp[0];
 			$id = $this->replaceSpecialChars($server);
 			// Get quotas
-			$quotas = lamdaemon(array("+ quota get " . $this->get_scope()), $server);
+			$quotas = lamdaemon(array(implode(quota::$SPLIT_DELIMITER, array("+", "quota", "get", $this->get_scope()))), $server);
 			$dirs = explode(":", $quotas[0]);
 			array_pop($dirs); // remove empty element at the end
 			for ($i = 0; $i < sizeof($dirs); $i++) {
@@ -622,7 +624,7 @@ class quota extends baseModule {
 				$temp = explode(":", $lamdaemonServers[$s]);
 				$server = $temp[0];
 				// Get quotas
-				$quotas = lamdaemon(array("+ quota get " . $this->get_scope()), $server);
+				$quotas = lamdaemon(array(implode(quota::$SPLIT_DELIMITER, array("+", "quota", "get", $this->get_scope()))), $server);
 				$dirs = explode(":", $quotas[0]);
 				array_pop($dirs); // remove empty element at the end
 				for ($i = 0; $i < sizeof($dirs); $i++) {
@@ -740,8 +742,8 @@ class quota extends baseModule {
 				$mpParts = explode(":", $mountPoints[$m]);
 				$server = $mpParts[0];
 				$dir = $mpParts[1];
-				$quotaString = $name . " quota set " . $this->get_scope() . " " . $dir . ',' .
-					implode(',', $temp['accounts'][$name][$mountPoints[$m]]) . "\n";
+				$quotaString = implode(quota::$SPLIT_DELIMITER, array($name, "quota", "set", $this->get_scope(), $dir . ',' .
+					implode(',', $temp['accounts'][$name][$mountPoints[$m]]) . "\n"));
 				$result = lamdaemon(array($quotaString), $server);
 				if (is_array($result)) {
 					for ($i = 0; $i < sizeof($result); $i++) {
@@ -761,7 +763,7 @@ class quota extends baseModule {
 		}
 		return array('status' => 'finished');
 	}
-
+	
 }
 
 ?>
diff --git a/lam/templates/tests/lamdaemonTest.php b/lam/templates/tests/lamdaemonTest.php
index e2625d16..634771a6 100644
--- a/lam/templates/tests/lamdaemonTest.php
+++ b/lam/templates/tests/lamdaemonTest.php
@@ -44,7 +44,6 @@ setlanguage();
 
 echo $_SESSION['header'];
 
-
 echo "<title></title>\n";
 echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../../style/layout.css\">\n";
 echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../../style/type_user.css\">\n";
@@ -200,6 +199,7 @@ function lamTestLamdaemon($command, $stopTest, $handle, $testText) {
  * @param boolean $testQuota true, if Quotas should be checked
  */
 function lamRunLamdaemonTestSuite($serverName, $serverTitle, $testQuota) {
+	$SPLIT_DELIMITER = "###x##y##x###";
 	$okImage = "<img src=\"../../graphics/pass.png\" alt=\"\">\n";
 	$failImage = "<img src=\"../../graphics/fail.png\" alt=\"\">\n";
 	
@@ -304,14 +304,14 @@ function lamRunLamdaemonTestSuite($serverName, $serverTitle, $testQuota) {
 
 	flush();
 	
-	$stopTest = lamTestLamdaemon("+ test basic\n", $stopTest, $handle, _("Execute lamdaemon"));
+	$stopTest = lamTestLamdaemon("+" . $SPLIT_DELIMITER . "test" . $SPLIT_DELIMITER . "basic\n", $stopTest, $handle, _("Execute lamdaemon"));
 	if ($testQuota) {
 		$handle = @ssh2_connect($serverName);
 		@ssh2_auth_password($handle, $userName, $credentials[1]);
-		$stopTest = lamTestLamdaemon("+ test quota\n", $stopTest, $handle, _("Lamdaemon: Quota module installed"));
+		$stopTest = lamTestLamdaemon("+" . $SPLIT_DELIMITER . "test" . $SPLIT_DELIMITER . "quota\n", $stopTest, $handle, _("Lamdaemon: Quota module installed"));
 		$handle = @ssh2_connect($serverName);
 		@ssh2_auth_password($handle, $userName, $credentials[1]);
-		$stopTest = lamTestLamdaemon("+ quota get user\n", $stopTest, $handle, _("Lamdaemon: read quotas"));
+		$stopTest = lamTestLamdaemon("+" . $SPLIT_DELIMITER . "quota" . $SPLIT_DELIMITER . "get" . $SPLIT_DELIMITER . "user\n", $stopTest, $handle, _("Lamdaemon: read quotas"));
 	}
 
 	echo "</table><br>\n";