diff --git a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php
index eb79a36965..a620cb6d5f 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php
@@ -88,7 +88,8 @@ class Horde_SyncML_Command_Sync extends Horde_SyncML_Command {
 
         $currentCmdID = $status->output($currentCmdID, $output);
 
-        if ($sync = &$state->getSync($this->_targetURI)) {
+        if ($this->_targetURI != "configuration" && // Fix Funambol issue
+        	($sync = &$state->getSync($this->_targetURI))) {
             $currentCmdID = $sync->startSync($currentCmdID, $output);
 
             foreach ($this->_syncElements as $element) {
diff --git a/phpgwapi/inc/horde/Horde/SyncML/Sync.php b/phpgwapi/inc/horde/Horde/SyncML/Sync.php
index 51609c6864..c2c236d3d7 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/Sync.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/Sync.php
@@ -328,10 +328,10 @@ class Horde_SyncML_Sync {
 				$merge = false;
 				if ($guid)
 				{
-					Horde::logMessage('SyncML: locuri'. $syncItem->getLocURI() . ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_DEBUG);
+					Horde::logMessage('SyncML: locuri '. $syncItem->getLocURI() . ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_DEBUG);
 					if (($sync_conflicts > CONFLICT_RESOLVED_WITH_DUPLICATE) || in_array($guid, $changes))
 					{
-						Horde::logMessage('SyncML: CONFLICT for locuri'. $syncItem->getLocURI() . ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_WARNING);
+						Horde::logMessage('SyncML: CONFLICT for locuri '. $syncItem->getLocURI() . ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_WARNING);
 						switch ($sync_conflicts)
 						{
 							case CONFLICT_CLIENT_WINNING: