diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 32bfed700c..ba9cf274df 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -84,6 +84,7 @@ namespace OpenSim.Framework.Communications
 
             return null;
         }
+        
         public void ResetAttachments(UUID userID)
         {
             foreach (IUserDataPlugin plugin in _plugins)
@@ -91,6 +92,7 @@ namespace OpenSim.Framework.Communications
                 plugin.ResetAttachments(userID);
             }
         }
+        
         public UserAgentData GetAgentByUUID(UUID userId)
         {
             foreach (IUserDataPlugin plugin in _plugins)
@@ -105,6 +107,7 @@ namespace OpenSim.Framework.Communications
 
             return null;
         }
+        
         // see IUserService
         public UserProfileData GetUserProfile(UUID uuid)
         {
@@ -137,6 +140,7 @@ namespace OpenSim.Framework.Communications
                     return new List<AvatarPickerAvatar>();
                 }
             }
+            
             return pickerlist;
         }
 
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 1f1f88bd26..20452e0c69 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <value>
         /// The endpoint of a sender of a particular packet.  The port is changed by the various socket receive methods
         /// </value>
-        protected EndPoint epSender = new IPEndPoint(IPAddress.Any, 0);
+        protected EndPoint epSender;
 
         protected EndPoint epProxy;
         protected int proxyPortOffset;
@@ -175,6 +175,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="result"></param>
         protected virtual void OnReceivedData(IAsyncResult result)
         {
+            epSender = new IPEndPoint(listenIP, 0);
             Packet packet = null;
 
             int numBytes = 1;