Index: /lib/wpsg_cache.class.php
===================================================================
--- /lib/wpsg_cache.class.php	(revision 5934)
+++ /lib/wpsg_cache.class.php	(revision 5936)
@@ -205,9 +205,21 @@
 				$this->_arKunden[$kunde_id] = $this->_db->fetchRow("
 					SELECT
-						*
+						C.*,
+						IF (CA.`id` > 0, CA.`title`, C.`title`) AS `title`,
+						IF (CA.`id` > 0, CA.`name`, C.`name`) AS `name`,
+						IF (CA.`id` > 0, CA.`vname`, C.`vname`) AS `vname`,
+						IF (CA.`id` > 0, CA.`firma`, C.`firma`) AS `firma`,
+						IF (CA.`id` > 0, CA.`fax`, C.`fax`) AS `fax`,
+						IF (CA.`id` > 0, CA.`strasse`, C.`strasse`) AS `strasse`,
+						IF (CA.`id` > 0, CA.`nr`, '') AS `nr`,
+						IF (CA.`id` > 0, CA.`plz`, C.`plz`) AS `plz`,
+						IF (CA.`id` > 0, CA.`ort`, C.`ort`) AS `ort`,
+						IF (CA.`id` > 0, CA.`land`, C.`land`) AS `land`,
+						IF (CA.`id` > 0, CA.`tel`, C.`tel`) AS `tel` 
 					FROM
-						`".WPSG_TBL_KU."` 
+						`".WPSG_TBL_KU."` AS C
+						 	LEFT JOIN `".WPSG_TBL_ADRESS."` AS CA ON (CA.`id` = C.`adress_id`) 
 					WHERE
-						`id` = '".wpsg_q($kunde_id)."'
+						C.`id` = '".wpsg_q($kunde_id)."'
 				");