1 files changed, 3 insertions, 6 deletions

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 6405811..ea9edf6 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -860,7 +860,7 @@ namespace OpenSim
                             = MainConsole.Instance.CmdPrompt(
                                 string.Format(
                                     "Do you wish to join region {0} to an existing estate (yes/no)?", regInfo.RegionName), 
-                                    "no", 
+                                    "yes", 
                                     new List<string>() { "yes", "no" });
                         
                         if (response == "no")
@@ -876,15 +876,12 @@ namespace OpenSim
                                 = MainConsole.Instance.CmdPrompt(
                                     string.Format(
                                         "Name of estate to join.  Existing estate names are ({0})", string.Join(", ", estateNames.ToArray())), 
-                                    "None");
-                            
-                            if (response == "None")
-                                continue;
+                                    estateNames[0]);
     
                             List<int> estateIDs = EstateDataService.GetEstates(response);
                             if (estateIDs.Count < 1)
                             {
-                                MainConsole.Instance.Output("The name you have entered matches no known estate. Please try again.");
+                                MainConsole.Instance.Output("The name you have entered matches no known estate.  Please try again.");
                                 continue;
                             }