diff --git a/OpenGridServices.UserServer/Main.cs b/OpenGridServices.UserServer/Main.cs
index 1c6ad8ce58..5006e6d9c1 100644
--- a/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices.UserServer/Main.cs
@@ -52,7 +52,7 @@ namespace OpenGridServices.UserServer
 
         public UserManager m_userManager; // Replaces below.
 
-        private UserProfileManager m_userProfileManager;
+        //private UserProfileManager m_userProfileManager; // Depreciated
 
         public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>();
 
@@ -93,17 +93,18 @@ namespace OpenGridServices.UserServer
 
             MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Establishing data connection");
             m_userManager = new UserManager();
+            m_userManager._config = Cfg;
 
-            MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Creating user profile manager");
-            m_userProfileManager = new UserProfileManager();
-            m_userProfileManager.InitUserProfiles();
-            m_userProfileManager.SetKeys(Cfg.GridSendKey, Cfg.GridRecvKey, Cfg.GridServerURL, Cfg.DefaultStartupMsg);
+            //MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Creating user profile manager");
+            //m_userProfileManager = new UserProfileManager();
+            //m_userProfileManager.InitUserProfiles();
+            //m_userProfileManager.SetKeys(Cfg.GridSendKey, Cfg.GridRecvKey, Cfg.GridServerURL, Cfg.DefaultStartupMsg);
 
             MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process");
             BaseHttpServer httpServer = new BaseHttpServer(8002);
 
-            httpServer.AddXmlRPCHandler("login_to_simulator", m_userProfileManager.XmlRpcLoginMethod);
-            httpServer.AddRestHandler("DELETE", "/usersessions/", m_userProfileManager.RestDeleteUserSessionMethod);
+            httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);
+            httpServer.AddRestHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod);
 
             httpServer.Start();
         }
@@ -114,7 +115,9 @@ namespace OpenGridServices.UserServer
             switch (what)
             {
                 case "user":
-                    m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"Creating new user profile");
+                    m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"Commandline user creation is currently disabled.");
+                    break;
+                    /*
                     string tempfirstname;
                     string templastname;
                     string tempMD5Passwd;
@@ -138,6 +141,7 @@ namespace OpenGridServices.UserServer
                     newuser.homepos = new LLVector3(128f, 128f, 150f);
                     m_userProfileManager.SaveUserProfiles();
                     break;
+                    */
             }
         }
 
diff --git a/OpenGridServices.UserServer/UserManager.cs b/OpenGridServices.UserServer/UserManager.cs
index 057fb79a1c..b93c26f2b7 100644
--- a/OpenGridServices.UserServer/UserManager.cs
+++ b/OpenGridServices.UserServer/UserManager.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 using OpenGrid.Framework.Data;
@@ -11,10 +12,13 @@ using OpenSim.Framework.Sims;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;
 
+using System.Security.Cryptography;
+
 namespace OpenGridServices.UserServer
 {
     public class UserManager
     {
+        public OpenSim.Framework.Interfaces.UserConfig _config;
         Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
 
         /// <summary>
@@ -23,10 +27,10 @@ namespace OpenGridServices.UserServer
         /// <param name="FileName">The filename to the user server plugin DLL</param>
         public void AddPlugin(string FileName)
         {
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Storage: Attempting to load " + FileName);
+            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Userstorage: Attempting to load " + FileName);
             Assembly pluginAssembly = Assembly.LoadFrom(FileName);
 
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
+            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
             foreach (Type pluginType in pluginAssembly.GetTypes())
             {
                 if (!pluginType.IsAbstract)
@@ -38,7 +42,7 @@ namespace OpenGridServices.UserServer
                         IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
                         plug.Initialise();
                         this._plugins.Add(plug.getName(), plug);
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Storage: Added IUserData Interface");
+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Userstorage: Added IUserData Interface");
                     }
 
                     typeInterface = null;
@@ -54,7 +58,9 @@ namespace OpenGridServices.UserServer
             {
                 try
                 {
-                    return plugin.Value.getUserByUUID(uuid);
+                    UserProfileData profile = plugin.Value.getUserByUUID(uuid);
+                    profile.currentAgent = getUserAgent(profile.UUID);
+                    return profile;
                 }
                 catch (Exception e)
                 {
@@ -71,7 +77,9 @@ namespace OpenGridServices.UserServer
             {
                 try
                 {
-                    return plugin.Value.getUserByName(name);
+                    UserProfileData profile = plugin.Value.getUserByName(name);
+                    profile.currentAgent = getUserAgent(profile.UUID);
+                    return profile;
                 }
                 catch (Exception e)
                 {
@@ -88,7 +96,9 @@ namespace OpenGridServices.UserServer
             {
                 try
                 {
-                    return plugin.Value.getUserByName(fname,lname);
+                    UserProfileData profile = plugin.Value.getUserByName(fname,lname);
+                    profile.currentAgent = getUserAgent(profile.UUID);
+                    return profile;
                 }
                 catch (Exception e)
                 {
@@ -149,5 +159,323 @@ namespace OpenGridServices.UserServer
 
             return null;
         }
+
+        private static XmlRpcResponse CreateErrorConnectingToGridResponse()
+        {
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable ErrorRespData = new Hashtable();
+            ErrorRespData["reason"] = "key";
+            ErrorRespData["message"] = "Error connecting to grid. Could not percieve credentials from login XML.";
+            ErrorRespData["login"] = "false";
+            response.Value = ErrorRespData;
+            return response;
+        }
+
+        private static XmlRpcResponse CreateLoginErrorResponse()
+        {
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable ErrorRespData = new Hashtable();
+            ErrorRespData["reason"] = "key";
+            ErrorRespData["message"] = "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.";
+            ErrorRespData["login"] = "false";
+            response.Value = ErrorRespData;
+            return response;
+        }
+
+        private static XmlRpcResponse CreateAlreadyLoggedInResponse()
+        {
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable PresenceErrorRespData = new Hashtable();
+            PresenceErrorRespData["reason"] = "presence";
+            PresenceErrorRespData["message"] = "You appear to be already logged in, if this is not the case please wait for your session to timeout, if this takes longer than a few minutes please contact the grid owner";
+            PresenceErrorRespData["login"] = "false";
+            response.Value = PresenceErrorRespData;
+            return response;
+        }
+
+        public virtual void CustomiseResponse(ref Hashtable response, ref UserProfileData theUser)
+        {
+            // Load information from the gridserver
+            SimProfile SimInfo = new SimProfile();
+            SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);
+
+            // Customise the response
+            // Home Location
+            response["home"] = "{'region_handle':[r" + (SimInfo.RegionLocX * 256).ToString() + ",r" + (SimInfo.RegionLocY * 256).ToString() + "], " + 
+                "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
+                "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
+
+            // Destination
+            response["sim_ip"] = SimInfo.sim_ip;
+            response["sim_port"] = (Int32)SimInfo.sim_port;
+            response["region_y"] = (Int32)SimInfo.RegionLocY * 256;
+            response["region_x"] = (Int32)SimInfo.RegionLocX * 256;
+
+            // Notify the target of an incoming user
+            Console.WriteLine("Notifying " + SimInfo.regionname + " (" + SimInfo.caps_url + ")");
+
+            // Prepare notification
+            Hashtable SimParams = new Hashtable();
+            SimParams["session_id"] = theUser.currentAgent.sessionID.ToString();
+            SimParams["secure_session_id"] = theUser.currentAgent.secureSessionID.ToString();
+            SimParams["firstname"] = theUser.username;
+            SimParams["lastname"] = theUser.surname;
+            SimParams["agent_id"] = theUser.UUID.ToString();
+            SimParams["circuit_code"] = (Int32)Convert.ToUInt32(response["circuit_code"]);
+            SimParams["startpos_x"] = theUser.currentAgent.currentPos.X.ToString();
+            SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString();
+            SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString();
+            ArrayList SendParams = new ArrayList();
+            SendParams.Add(SimParams);
+
+            // Update agent with target sim
+            theUser.currentAgent.currentRegion = SimInfo.UUID;
+            theUser.currentAgent.currentHandle = SimInfo.regionhandle;
+
+            // Send
+            XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
+            XmlRpcResponse GridResp = GridReq.Send(SimInfo.caps_url, 3000);
+        }
+
+        public bool AuthenticateUser(ref UserProfileData profile, string password)
+        {
+            password = password.Remove(0, 3); //remove $1$
+
+            MD5CryptoServiceProvider MD5summer = new MD5CryptoServiceProvider();
+
+            byte[] byteString = System.Text.Encoding.ASCII.GetBytes(password + ":" + profile.passwordSalt);
+
+            byteString = MD5summer.ComputeHash(byteString);
+            System.Text.StringBuilder s = new System.Text.StringBuilder();
+            foreach (byte b in byteString)
+            {
+                s.Append(b.ToString("x2").ToLower());
+            }
+
+            return profile.passwordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase);
+        }
+
+        public void CreateAgent(ref UserProfileData profile, XmlRpcRequest request)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+
+            UserAgentData agent = new UserAgentData();
+
+            // User connection
+            agent.agentIP = "";
+            agent.agentOnline = true;
+            agent.agentPort = 0;
+
+            // Generate sessions
+            RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();
+            byte[] randDataS = new byte[16];
+            byte[] randDataSS = new byte[16];
+            rand.GetBytes(randDataS);
+            rand.GetBytes(randDataSS);
+
+            agent.secureSessionID = new LLUUID(randDataSS, 0);
+            agent.sessionID = new LLUUID(randDataS, 0);
+
+            // Profile UUID
+            agent.UUID = profile.UUID;
+
+            // Current position (from Home)
+            agent.currentHandle = profile.homeRegion;
+            agent.currentPos = profile.homeLocation;
+
+            // If user specified additional start, use that
+            if (requestData.ContainsKey("start"))
+            {
+                string startLoc = (string)requestData["start"];
+                if (!(startLoc == "last" || startLoc == "home"))
+                {
+                    // Ignore it! Heh.
+                }
+            }
+
+            // What time did the user login?
+            agent.loginTime = Util.UnixTimeSinceEpoch();
+            agent.logoutTime = 0;
+
+            // Current location
+            agent.regionID = new LLUUID(); // Fill in later
+            agent.currentRegion = "";      // Fill in later
+        }
+
+        public bool CommitAgent(ref UserProfileData profile)
+        {
+            // Saves the agent to database
+            return true;
+        }
+
+        public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
+        {
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable requestData = (Hashtable)request.Params[0];
+
+            bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") && requestData.Contains("passwd"));
+            bool GoodLogin = false;
+            string firstname = "";
+            string lastname = "";
+            string passwd = "";
+
+            UserProfileData TheUser;
+
+            if (GoodXML)
+            {
+                firstname = (string)requestData["first"];
+                lastname = (string)requestData["last"];
+                passwd = (string)requestData["passwd"];
+
+                TheUser = getUserProfile(firstname, lastname);
+                GoodLogin = AuthenticateUser(ref TheUser, passwd);
+            }
+            else
+            {
+                return CreateErrorConnectingToGridResponse();
+            }
+
+            if (!GoodLogin)
+            {
+                return CreateLoginErrorResponse();
+            }
+            else
+            {
+                // If we already have a session...
+                if (TheUser.currentAgent != null && TheUser.currentAgent.agentOnline)
+                {
+                    // Reject the login
+                    return CreateAlreadyLoggedInResponse();
+                }
+                // Otherwise...
+                // Create a new agent session
+                CreateAgent(ref TheUser, request);
+
+                try
+                {
+                    Hashtable responseData = new Hashtable();
+
+                    LLUUID AgentID = TheUser.UUID;
+                    
+                    // Global Texture Section
+                    Hashtable GlobalT = new Hashtable();
+                    GlobalT["sun_texture_id"] = "cce0f112-878f-4586-a2e2-a8f104bba271";
+                    GlobalT["cloud_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
+                    GlobalT["moon_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
+                    ArrayList GlobalTextures = new ArrayList();
+                    GlobalTextures.Add(GlobalT);
+
+                    // Login Flags Section
+                    Hashtable LoginFlagsHash = new Hashtable();
+                    LoginFlagsHash["daylight_savings"] = "N";
+                    LoginFlagsHash["stipend_since_login"] = "N";
+                    LoginFlagsHash["gendered"] = "Y";
+                    LoginFlagsHash["ever_logged_in"] = "N"; // Should allow male/female av selection
+                    ArrayList LoginFlags = new ArrayList();
+                    LoginFlags.Add(LoginFlagsHash);
+
+                    // UI Customisation Section
+                    Hashtable uiconfig = new Hashtable();
+                    uiconfig["allow_first_life"] = "Y";
+                    ArrayList ui_config = new ArrayList();
+                    ui_config.Add(uiconfig);
+
+                    // Classified Categories Section
+                    Hashtable ClassifiedCategoriesHash = new Hashtable();
+                    ClassifiedCategoriesHash["category_name"] = "Generic";
+                    ClassifiedCategoriesHash["category_id"] = (Int32)1;
+                    ArrayList ClassifiedCategories = new ArrayList();
+                    ClassifiedCategories.Add(ClassifiedCategoriesHash);
+
+                    // Inventory Library Section
+                    ArrayList AgentInventoryArray = new ArrayList();
+                    Hashtable TempHash;
+
+                    AgentInventory Library = new AgentInventory();
+                    Library.CreateRootFolder(AgentID, true);
+
+                    foreach (InventoryFolder InvFolder in Library.InventoryFolders.Values)
+                    {
+                        TempHash = new Hashtable();
+                        TempHash["name"] = InvFolder.FolderName;
+                        TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated();
+                        TempHash["version"] = (Int32)InvFolder.Version;
+                        TempHash["type_default"] = (Int32)InvFolder.DefaultType;
+                        TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated();
+                        AgentInventoryArray.Add(TempHash);
+                    }
+
+                    Hashtable InventoryRootHash = new Hashtable();
+                    InventoryRootHash["folder_id"] = Library.InventoryRoot.FolderID.ToStringHyphenated();
+                    ArrayList InventoryRoot = new ArrayList();
+                    InventoryRoot.Add(InventoryRootHash);
+
+                    Hashtable InitialOutfitHash = new Hashtable();
+                    InitialOutfitHash["folder_name"] = "Nightclub Female";
+                    InitialOutfitHash["gender"] = "female";
+                    ArrayList InitialOutfit = new ArrayList();
+                    InitialOutfit.Add(InitialOutfitHash);
+
+                    // Circuit Code
+                    uint circode = (uint)(Util.RandomClass.Next());
+
+                    // Generics
+                    responseData["last_name"] = TheUser.surname;
+                    responseData["ui-config"] = ui_config;
+                    responseData["sim_ip"] = "127.0.0.1"; //SimInfo.sim_ip.ToString();
+                    responseData["login-flags"] = LoginFlags;
+                    responseData["global-textures"] = GlobalTextures;
+                    responseData["classified_categories"] = ClassifiedCategories;
+                    responseData["event_categories"] = new ArrayList();
+                    responseData["inventory-skeleton"] = AgentInventoryArray;
+                    responseData["inventory-skel-lib"] = new ArrayList();
+                    responseData["inventory-root"] = InventoryRoot;
+                    responseData["event_notifications"] = new ArrayList();
+                    responseData["gestures"] = new ArrayList();
+                    responseData["inventory-lib-owner"] = new ArrayList();
+                    responseData["initial-outfit"] = InitialOutfit;
+                    responseData["seconds_since_epoch"] = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+                    responseData["start_location"] = "last";
+                    responseData["home"] = "!!null temporary value {home}!!";   // Overwritten
+                    responseData["message"] = _config.DefaultStartupMsg;
+                    responseData["first_name"] = TheUser.username;
+                    responseData["circuit_code"] = (Int32)circode;
+                    responseData["sim_port"] = 0; //(Int32)SimInfo.sim_port;
+                    responseData["secure_session_id"] = TheUser.currentAgent.secureSessionID.ToStringHyphenated();
+                    responseData["look_at"] = "\n[r" + TheUser.homeLookAt.X.ToString() + ",r" + TheUser.homeLookAt.Y.ToString() + ",r" + TheUser.homeLookAt.Z.ToString() + "]\n";
+                    responseData["agent_id"] = AgentID.ToStringHyphenated();
+                    responseData["region_y"] = (Int32)0;    // Overwritten
+                    responseData["region_x"] = (Int32)0;    // Overwritten
+                    responseData["seed_capability"] = "";
+                    responseData["agent_access"] = "M";
+                    responseData["session_id"] = TheUser.currentAgent.sessionID.ToStringHyphenated();
+                    responseData["login"] = "true";
+
+                    this.CustomiseResponse(ref responseData, ref TheUser);
+
+                    CommitAgent(ref TheUser);
+
+                    response.Value = responseData;
+                    //                   TheUser.SendDataToSim(SimInfo);
+                    return response;
+
+                }
+                catch (Exception E)
+                {
+                    Console.WriteLine(E.ToString());
+                }
+                //}
+            }
+            return response;
+
+        }
+
+        public string RestDeleteUserSessionMethod(string request, string path, string param)
+        {
+            // TODO! Important!
+
+            return "OK";
+        }
+
     }
 }
diff --git a/OpenSim.Framework/AgentInventory.cs b/OpenSim.Framework/AgentInventory.cs
index a3c6cecf5b..b28645e465 100644
--- a/OpenSim.Framework/AgentInventory.cs
+++ b/OpenSim.Framework/AgentInventory.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Framework.Inventory
             InventoryRoot.Version = 1;
             InventoryRoot.DefaultType = 8;
             InventoryRoot.OwnerID = this.AgentID;
-            InventoryRoot.FolderName = "My Inventory-";
+            InventoryRoot.FolderName = "My Inventory";
             InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot);
             InventoryRoot.OwnerID = this.AgentID;
             if (createTextures)