diff --git a/rhodecode/events/base.py b/rhodecode/events/base.py
index 0e3a4052..9ea6f9e4 100644
--- a/rhodecode/events/base.py
+++ b/rhodecode/events/base.py
@@ -83,7 +83,12 @@ class RhodecodeEvent(object):
         if isinstance(auth_user, AuthUser):
             instance = auth_user.get_instance()
             if instance:
-                return instance
+                return AttributeDict(
+                    dict(
+                        username=instance.username,
+                        user_id=instance.user_id,
+                    )
+                )
             else:
                 # we can't find this DB user...
                 return AttributeDict(
@@ -92,6 +97,7 @@ class RhodecodeEvent(object):
                         user_id=auth_user.user_id,
                     )
                 )
+
         elif auth_user:
             return auth_user
         return SYSTEM_USER