diff --git a/OpenGridServices.GridServer/GridManager.cs b/OpenGridServices.GridServer/GridManager.cs
index bf3a9224fd..e41f3d50c0 100644
--- a/OpenGridServices.GridServer/GridManager.cs
+++ b/OpenGridServices.GridServer/GridManager.cs
@@ -16,6 +16,7 @@ namespace OpenGridServices.GridServer
     class GridManager
     {
         Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>();
+        public string defaultRecvKey;
 
         /// <summary>
         /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded.
@@ -268,7 +269,7 @@ namespace OpenGridServices.GridServer
                 TheSim = new SimProfileData();
                 LLUUID UUID = new LLUUID(param);
                 TheSim.UUID = UUID;
-                TheSim.regionRecvKey = "badger";// MAJORFIX
+                TheSim.regionRecvKey = defaultRecvKey;
             }
 
             XmlDocument doc = new XmlDocument();
diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices.GridServer/Main.cs
index fe5bf593fa..ba6c60d90f 100644
--- a/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices.GridServer/Main.cs
@@ -98,6 +98,7 @@ namespace OpenGridServices.GridServer
             m_console.WriteLine("Main.cs:Startup() - Connecting to Storage Server");
             m_gridManager = new GridManager();
             m_gridManager.AddPlugin(GridDll); // Made of win
+            m_gridManager.defaultRecvKey = Cfg.SimRecvKey;
 
             m_console.WriteLine("Main.cs:Startup() - Starting HTTP process");
             BaseHttpServer httpServer = new BaseHttpServer(8001);