diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 0195c03d4c..aaa318cabb 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -56,6 +56,9 @@
         <RegionModule id="RemotePresenceServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.RemotePresenceServicesConnector" />
         <RegionModule id="LocalUserAccountServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.LocalUserAccountServicesConnector" />
         <RegionModule id="RemoteUserAccountServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.RemoteUserAccountServicesConnector" />
+        
+        <RegionModule id="LocalGridUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser.LocalGridUserServicesConnector" />
+        
         <RegionModule id="LocalSimulationConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.LocalSimulationConnectorModule" />
         <RegionModule id="RemoteSimulationConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.RemoteSimulationConnectorModule" />
       <!-- Service connectors IN modules -->
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 54e11af432..92c215498e 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -5,17 +5,18 @@
 ;;
 
 [Modules]
-    AssetServices = "LocalAssetServicesConnector"
-    InventoryServices = "LocalInventoryServicesConnector"
-    NeighbourServices = "LocalNeighbourServicesConnector"
-    AuthenticationServices = "LocalAuthenticationServicesConnector"
-    GridServices = "LocalGridServicesConnector"
-    PresenceServices = "LocalPresenceServicesConnector"
-    UserAccountServices = "LocalUserAccountServicesConnector"
-    SimulationServices = "LocalSimulationConnectorModule"
-    AvatarServices = "LocalAvatarServicesConnector"
-    EntityTransferModule = "BasicEntityTransferModule"
-    InventoryAccessModule = "BasicInventoryAccessModule"
+    AssetServices           = "LocalAssetServicesConnector"
+    InventoryServices       = "LocalInventoryServicesConnector"
+    NeighbourServices       = "LocalNeighbourServicesConnector"
+    AuthenticationServices  = "LocalAuthenticationServicesConnector"
+    GridServices            = "LocalGridServicesConnector"
+    PresenceServices        = "LocalPresenceServicesConnector"
+    UserAccountServices     = "LocalUserAccountServicesConnector"
+    GridUserServices        = "LocalGridUserServicesConnector"
+    SimulationServices      = "LocalSimulationConnectorModule"
+    AvatarServices          = "LocalAvatarServicesConnector"
+    EntityTransferModule    = "BasicEntityTransferModule"
+    InventoryAccessModule   = "BasicInventoryAccessModule"
     LibraryModule = true
     LLLoginServiceInConnector = true
 
@@ -57,6 +58,9 @@
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
 
+[GridUserService]
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
+
 [FriendsService]
     LocalServiceModule = "OpenSim.Services.FriendsService.dll"
 
@@ -64,14 +68,14 @@
     Connector = "OpenSim.Services.FriendsService.dll"
 
 [LoginService]
-    LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
-    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    LocalServiceModule    = "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    UserAccountService    = "OpenSim.Services.UserAccountService.dll:UserAccountService"
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
-    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
-    GridService = "OpenSim.Services.GridService.dll:GridService"
-    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
-    FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
+    InventoryService      = "OpenSim.Services.InventoryService.dll:InventoryService"
+    PresenceService       = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService           = "OpenSim.Services.GridService.dll:GridService"
+    AvatarService         = "OpenSim.Services.AvatarService.dll:AvatarService"
+    FriendsService        = "OpenSim.Services.FriendsService.dll:FriendsService"
 
     WelcomeMessage = "Welcome, Avatar!"