diff --git a/phpgwapi/inc/class.crypto.inc.php b/phpgwapi/inc/class.crypto.inc.php
index 3c096f6c25..9b3dcea0e3 100644
--- a/phpgwapi/inc/class.crypto.inc.php
+++ b/phpgwapi/inc/class.crypto.inc.php
@@ -159,14 +159,14 @@
 			{
 				$data = $encrypteddata;
 			}
+			$data = stripslashes($data);
+
 			if(!strpos(' '.$data,'O:8:"stdClass"'))
 			{
 				return unserialize($data);
 			}
 			else
 			{
-				$data = stripslashes($data);
-
 				return $data;
 			}
 		}