diff --git a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
index 88caeb828e..1a3bcb9834 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Framework.Data.DB4o
         {   
             try
             {
-                return null;
+                return getUserByUUID(uuid).currentAgent;
             }
             catch (Exception)
             {