diff --git a/ATxCommon/Serializables/ServiceConfig.cs b/ATxCommon/Serializables/ServiceConfig.cs
index d5bf0690a609b0c014e107de0c34ac7f32fecbab..12f8052898258969cca14792ea397aad6bc8b679 100644
--- a/ATxCommon/Serializables/ServiceConfig.cs
+++ b/ATxCommon/Serializables/ServiceConfig.cs
@@ -41,12 +41,6 @@ namespace ATxCommon.Serializables
         /// </summary>
         public string ManagedDirectory { get; set; }
 
-        /// <summary>
-        /// GracePeriod: number of days after data in the "DONE" location expires,
-        /// which will trigger a summary email to the admin address.
-        /// </summary>
-        public int GracePeriod { get; set; }
-
         /// <summary>
         /// A human friendly name for the target, to be used in emails etc.
         /// </summary>
@@ -161,6 +155,12 @@ namespace ATxCommon.Serializables
         /// </summary>
         public int StorageNotificationDelta { get; set; }
 
+        /// <summary>
+        /// GracePeriod: number of days after data in the "DONE" location expires,
+        /// which will trigger a summary email to the admin address, default: 30.
+        /// </summary>
+        public int GracePeriod { get; set; }
+
         /// <summary>
         /// A list of process names causing transfers to be suspended if running.
         /// </summary>
@@ -249,6 +249,7 @@ namespace ATxCommon.Serializables
             AdminNotificationDelta = 60;
             GraceNotificationDelta = 720;
             StorageNotificationDelta = 720;
+            GracePeriod = 30;
             // BlacklistedProcesses may be empty
             EnforceInheritedACLs = true;
             // SpaceMonitoring may be empty
diff --git a/Resources/conf/config.common.xml b/Resources/conf/config.common.xml
index fe28063b5f015800a0cd4cf944611e8b31c1befc..c985d944580577de54a1405ef1a48bd12134307d 100644
--- a/Resources/conf/config.common.xml
+++ b/Resources/conf/config.common.xml
@@ -11,10 +11,6 @@
          the transfer (sub-directory "DONE"). -->
     <ManagedDirectory>ATX\MANAGED</ManagedDirectory>
 
-    <!-- GracePeriod: number of days after data in the "DONE" location expires,
-         which will trigger a summary email to the admin address. -->
-    <GracePeriod>30</GracePeriod>
-
     <!-- DestinationAlias: friendly name for the target to be used in mails -->
     <DestinationAlias>Core Facility Storage</DestinationAlias>
 
@@ -85,6 +81,10 @@
          in case one of the drives is below the threshold (in minutes) -->
     <StorageNotificationDelta>720</StorageNotificationDelta>
 
+    <!-- GracePeriod: number of days after data in the "DONE" location expires,
+         which will trigger a summary email to the admin address. -->
+    <GracePeriod>30</GracePeriod>
+
     <!-- BlacklistedProcesses: a list of "ProcessName" entries denoting
          programs that will cause a transfer to be suspended immediately if the
          name is found in the list of running processes -->