diff --git a/OpenSim/Data/IRegionProfileService.cs b/OpenSim/Data/IRegionProfileService.cs
new file mode 100644
index 0000000000..5aa5b58019
--- /dev/null
+++ b/OpenSim/Data/IRegionProfileService.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenMetaverse;
+
+namespace OpenSim.Data
+{
+    public interface IRegionProfileService
+    {
+        /// <summary>
+        /// Request sim profile information from a grid server, by Region UUID
+        /// </summary>
+        /// <param name="regionId">The region UUID to look for</param>
+        /// <param name="gridserverUrl"></param>
+        /// <param name="gridserverSendkey"></param>
+        /// <param name="gridserverRecvkey"></param>
+        /// <returns>The sim profile.  Null if there was a request failure</returns>
+        /// <remarks>This method should be statics</remarks>
+        RegionProfileData RequestSimProfileData(UUID regionId, Uri gridserverUrl,
+                                                       string gridserverSendkey, string gridserverRecvkey);
+
+        /// <summary>
+        /// Request sim profile information from a grid server, by Region Handle
+        /// </summary>
+        /// <param name="region_handle">the region handle to look for</param>
+        /// <param name="gridserver_url"></param>
+        /// <param name="gridserver_sendkey"></param>
+        /// <param name="gridserver_recvkey"></param>
+        /// <returns>The sim profile.  Null if there was a request failure</returns>
+        RegionProfileData RequestSimProfileData(ulong region_handle, Uri gridserver_url,
+                                                       string gridserver_sendkey, string gridserver_recvkey);
+
+        /// <summary>
+        /// Request sim profile information from a grid server, by Region Name
+        /// </summary>
+        /// <param name="regionName">the region name to look for</param>
+        /// <param name="gridserverUrl"></param>
+        /// <param name="gridserverSendkey"></param>
+        /// <param name="gridserverRecvkey"></param>
+        /// <returns>The sim profile.  Null if there was a request failure</returns>
+        RegionProfileData RequestSimProfileData(string regionName, Uri gridserverUrl,
+                                                       string gridserverSendkey, string gridserverRecvkey);
+    }
+}
diff --git a/OpenSim/Data/RegionProfileService.cs b/OpenSim/Data/RegionProfileServiceProxy.cs
similarity index 96%
rename from OpenSim/Data/RegionProfileService.cs
rename to OpenSim/Data/RegionProfileServiceProxy.cs
index 0cd40212b2..54e392ab47 100644
--- a/OpenSim/Data/RegionProfileService.cs
+++ b/OpenSim/Data/RegionProfileServiceProxy.cs
@@ -8,7 +8,7 @@ using OpenSim.Framework;
 
 namespace OpenSim.Data
 {
-    public class RegionProfileService
+    public class RegionProfileServiceProxy : IRegionProfileService
     {
         /// <summary>
         /// Request sim data based on arbitrary key/value
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 70aaea399a..2199e93093 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -168,7 +168,7 @@ namespace OpenSim.Grid.UserServer
         protected virtual void StartupLoginService(IInterServiceInventoryServices inventoryService)
         {
             m_loginService = new UserLoginService(
-                m_userManager, inventoryService, new LibraryRootFolder(Cfg.LibraryXmlfile), Cfg, Cfg.DefaultStartupMsg, new RegionProfileService());
+                m_userManager, inventoryService, new LibraryRootFolder(Cfg.LibraryXmlfile), Cfg, Cfg.DefaultStartupMsg, new RegionProfileServiceProxy());
         }
 
         protected virtual void AddHttpHandlers()
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index b11714a140..d069e1a68b 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -59,12 +59,12 @@ namespace OpenSim.Grid.UserServer
         private UserLoggedInAtLocation handlerUserLoggedInAtLocation;
 
         public UserConfig m_config;
-        private readonly RegionProfileService m_regionProfileService;
+        private readonly IRegionProfileService m_regionProfileService;
 
         public UserLoginService(
             UserManagerBase userManager, IInterServiceInventoryServices inventoryService,
             LibraryRootFolder libraryRootFolder,
-            UserConfig config, string welcomeMess, RegionProfileService regionProfileService)
+            UserConfig config, string welcomeMess, IRegionProfileService regionProfileService)
             : base(userManager, libraryRootFolder, welcomeMess)
         {
             m_config = config;