diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 6106d934f9..504563a8be 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -84,6 +84,8 @@ namespace OpenSim.Grid.InventoryServer
 
             m_log.Info("[" + LogName + "]: Started HTTP server");
 
+            new HGInventoryService(m_inventoryService, config.AssetServerURL, config.UserServerURL, m_httpServer, config.InventoryServerURL);
+
             base.StartupSpecific();
 
             m_console.Commands.AddCommand("inventoryserver", false, "add user",
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 8e8555944b..c0932bd7d4 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -37,6 +37,7 @@
         <RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" />
         <RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" />
         <RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" />    \
+        <RegionModule id="HGAuthServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication.HGAuthServiceInConnectorModule" />    \
 
     </Extension>
 
diff --git a/OpenSim/Services/Interfaces/IUserService.cs b/OpenSim/Services/Interfaces/IUserService.cs
index 9bbe503441..05eda975a9 100644
--- a/OpenSim/Services/Interfaces/IUserService.cs
+++ b/OpenSim/Services/Interfaces/IUserService.cs
@@ -30,7 +30,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Services.Interfaces
 {
-    public class UserData
+    public class UserAccountData
     {
         public UserData()
         {
@@ -78,7 +78,7 @@ namespace OpenSim.Services.Interfaces
 
     };
 
-    public class UserDataMessage
+    public class UserAccountDataMessage
     {
         public UserData Data;
 
@@ -93,10 +93,10 @@ namespace OpenSim.Services.Interfaces
         public UUID SessionID;
     };
 
-    public interface IUserDataService
+    public interface IUserAccountDataService
     {
-        UserData GetUserData(UUID scopeID, UUID userID);
-        UserData GetUserData(UUID scopeID, string FirstName, string LastName);
+        UserData GetUserAccountData(UUID scopeID, UUID userID);
+        UserData GetUserAccountData(UUID scopeID, string FirstName, string LastName);
 
         // This will set only the home region portion of the data!
         // Can't be used to set god level, flags, type or change the name!
@@ -105,7 +105,7 @@ namespace OpenSim.Services.Interfaces
 
         // Update all updatable fields
         //
-        bool SetUserData(UserData data, UUID PrincipalID, UUID SessionID);
+        bool SetUserAccountData(UserData data, UUID PrincipalID, UUID SessionID);
         
         // Returns the list of avatars that matches both the search
         // criterion and the scope ID passed
@@ -113,6 +113,6 @@ namespace OpenSim.Services.Interfaces
         List<UserData> GetAvatarPickerData(UUID scopeID, string query);
 
         // Creates a user data record
-        bool CreateUserData(UserData data, UUID PrincipalID, UUID SessionID);
+        bool CreateUserAccountData(UserData data, UUID PrincipalID, UUID SessionID);
     }
 }