diff --git a/phpgwapi/inc/class.acl.inc.php b/phpgwapi/inc/class.acl.inc.php
index 474bb23729..86e2aa8ee9 100644
--- a/phpgwapi/inc/class.acl.inc.php
+++ b/phpgwapi/inc/class.acl.inc.php
@@ -569,6 +569,7 @@
 			$security = "('". $this->account_id ."'";
 			$myaccounts = CreateObject('phpgwapi.accounts');
 			$my_memberships = $myaccounts->memberships($this->account_id);
+			unset($myaccounts);
 			@reset($my_memberships);
 			while($my_memberships && list($key,$group) = each($my_memberships))
 			{
diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php
index 6d7aad36c4..41d1f6c78e 100644
--- a/phpgwapi/inc/functions.inc.php
+++ b/phpgwapi/inc/functions.inc.php
@@ -410,8 +410,8 @@
 		{
 			if (ereg('enable_',$phpgw_class_name[0]))
 			{
-				$enable_class = ereg_replace('enable_','',$phpgw_class_name[0]);
-				$enable_class = ereg_replace('_class','',$enable_class);
+				$enable_class = str_replace('enable_','',$phpgw_class_name[0]);
+				$enable_class = str_replace('_class','',$enable_class);
 				eval('$phpgw->' . $enable_class . ' = createobject(\'phpgwapi.' . $enable_class . '\');');
 			}
 		}