diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index c3e5c9af3..523efafa5 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -1203,6 +1203,9 @@ class e107
 		{
 			return self::getUser();
 		}
+		
+		if(!$user_id) return self::getObject('e_system_user');
+		
 		$user = self::getRegistry('core/e107/user/'.$user_id);
 		if(null === $user)
 		{