diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 8c25603dd3..17811cdff4 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -390,5 +390,10 @@ namespace OpenSim.Framework
 
             return true;
         }
+        public void SaveEstatecovenantUUID(LLUUID notecard) 
+        {
+            configMember.forceSetConfigurationOption("estate_covanant_uuid", notecard.ToString());
+
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index 9fe11fcd32..06c275051e 100644
--- a/OpenSim/Region/Environment/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -477,7 +477,7 @@ namespace OpenSim.Region.Environment
             foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
             {
                 float timeSeconds = 0;
-                timeSeconds = BitConverter.ToInt16(block.Parameter, 1);
+                timeSeconds = BitConverter.ToInt32(block.Parameter, 1);
                 timeSeconds = (int) ((timeSeconds/100) - 3);
                 m_scene.Restart(timeSeconds);
             }
@@ -489,6 +489,7 @@ namespace OpenSim.Region.Environment
             {
                 LLUUID newCovenantID = new LLUUID(Helpers.FieldToUTF8String(block.Parameter));
                 m_regInfo.CovenantID = newCovenantID;
+                m_scene.RegionInfo.SaveEstatecovenantUUID(newCovenantID);
             }
         }