diff --git a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs b/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
index cd26cfcf14..2ed4fd20ee 100644
--- a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
@@ -40,7 +40,6 @@ namespace OpenGrid.Framework.Communications
     public class CommunicationsManager
     {
         public IUserServices UserServer;
-        public ILoginService LoginServer;
         public IGridServices GridServer;
         public IInterRegionCommunications InterRegion;
 
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
index e061805e0b..537151da0e 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
@@ -97,7 +97,6 @@
     <Compile Include="IInterRegionCommunications.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ILoginService.cs" />
     <Compile Include="IUserServices.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs b/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
index e42e414475..fb7dc7d53e 100644
--- a/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
+++ b/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenGrid.Framework.Communications;
 
-using OpenSim.LocalCommunications.LocalLoginManagement;
 using OpenSim.LocalCommunications.LocalUserManagement;
 
 namespace OpenSim.LocalCommunications
@@ -44,14 +43,11 @@ namespace OpenSim.LocalCommunications
     {
         public LocalBackEndServices SandBoxManager = new LocalBackEndServices();
         public LocalUserServices UserServices = new LocalUserServices();
-        public LocalLoginService LoginService;
     
         public CommunicationsLocal()
         {
-            LoginService = new LocalLoginService(this.UserServices);
 
             UserServer = UserServices;
-            LoginServer = LoginService;
             GridServer = SandBoxManager;
             InterRegion = SandBoxManager;
         }
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs
new file mode 100644
index 0000000000..f438117bd8
--- /dev/null
+++ b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenGrid.Framework.Communications;
+using OpenSim.Framework.User;
+
+using libsecondlife;
+
+namespace OpenSim.LocalCommunications.LocalUserManagement
+{
+    public class LocalUserServices : IUserServices
+    {
+        public UserProfileManager userProfileManager = new UserProfileManager();
+        public LocalLoginService localLoginService;
+        public LocalUserServices()
+        {
+            localLoginService  = new LocalLoginService(this);
+        }
+
+        public UserProfile GetUserProfile(string first_name, string last_name)
+        {
+            return GetUserProfile(first_name + " " + last_name);
+        }
+
+        public UserProfile GetUserProfile(string name)
+        {
+            return null;
+        }
+        public UserProfile GetUserProfile(LLUUID avatar_id)
+        {
+            return null;
+        }
+
+    }
+}
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs
new file mode 100644
index 0000000000..5f9d0283a1
--- /dev/null
+++ b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using libsecondlife;
+using OpenSim.Framework.User;
+
+namespace OpenSim.LocalCommunications.LocalUserManagement
+{
+    public class UserProfileManager
+    {
+        Dictionary<LLUUID, UserProfile> userProfiles = new Dictionary<LLUUID, UserProfile>();
+
+        public UserProfileManager()
+        {
+        }
+
+        private LLUUID getUserUUID(string first_name, string last_name)
+        {
+            return getUserUUID(first_name + " " + last_name);
+        }
+        private LLUUID getUserUUID(string name)
+        {
+            return null;
+        }
+
+
+        public UserProfile getUserProfile(string first_name, string last_name)
+        {
+            return getUserProfile(first_name + " " + last_name);
+        }
+        public UserProfile getUserProfile(string name)
+        {
+            return null;
+        }
+        public UserProfile getUserProfile(LLUUID user_id)
+        {
+            return null;
+        }
+
+    }
+}
diff --git a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj
index af5d2d3c8d..f7c28ebeb2 100644
--- a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj
+++ b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj
@@ -100,7 +100,7 @@
     <Compile Include="LocalBackEndServices.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LocalLoginManagement\LocalLoginService.cs" />
+    <Compile Include="LocalUserManagement\LocalLoginService.cs" />
     <Compile Include="LocalUserManagement\LocalUserServices.cs" />
     <Compile Include="LocalUserManagement\UserProfileManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">