diff --git a/phpgwapi/inc/class.crypto.inc.php b/phpgwapi/inc/class.crypto.inc.php
index f80ff242e9..ce71f46ca8 100644
--- a/phpgwapi/inc/class.crypto.inc.php
+++ b/phpgwapi/inc/class.crypto.inc.php
@@ -268,6 +268,10 @@
 				$data = $encrypteddata;
 			}
 
+			// Fix strange bug
+			// Without this, somes ^@^@^@^@ appears in data
+			$data = chop($data);
+
 			$newdata = @unserialize($data);
 			if($newdata)
 			{