diff --git a/phpgwapi/inc/class.crypto.inc.php b/phpgwapi/inc/class.crypto.inc.php
index 177afdc56c..3c096f6c25 100644
--- a/phpgwapi/inc/class.crypto.inc.php
+++ b/phpgwapi/inc/class.crypto.inc.php
@@ -159,13 +159,14 @@
 			{
 				$data = $encrypteddata;
 			}
-			$data = stripslashes($data);
 			if(!strpos(' '.$data,'O:8:"stdClass"'))
 			{
 				return unserialize($data);
 			}
 			else
 			{
+				$data = stripslashes($data);
+
 				return $data;
 			}
 		}
diff --git a/phpgwapi/inc/class.sbox2.inc.php b/phpgwapi/inc/class.sbox2.inc.php
index 507d7f3620..6bc2131e3f 100644
--- a/phpgwapi/inc/class.sbox2.inc.php
+++ b/phpgwapi/inc/class.sbox2.inc.php
@@ -298,7 +298,7 @@
 				$aarr[$a['account_id']] = $this->accountInfo($a['account_id'],$a,$longnames);
 				next($accs);
 			}
-			return $this->getArrayItem($name,$selected,$aarr,1);			
+			return $this->getArrayItem($name,$id,$aarr,1);			
 		}
 
 		function getDate($n_year,$n_month,$n_day,$date)