diff --git a/ATxCommon/Serializables/DriveToCheck.cs b/ATxCommon/Serializables/DriveToCheck.cs
index 279dcb86ea389b03d225efd3db6ffa2a02b6c002..6411bdbc36d8354cdcca054cba9a69872ccc6ef3 100644
--- a/ATxCommon/Serializables/DriveToCheck.cs
+++ b/ATxCommon/Serializables/DriveToCheck.cs
@@ -11,7 +11,7 @@
         public string DriveName { get; set; }
 
         /// <summary>
-        /// Limit (in MB) of free space, lower values will trigger a notification.
+        /// Limit (in GB) of free space, lower values will trigger a notification.
         /// </summary>
         public long SpaceThreshold { get; set; }
     }
diff --git a/ATxCommon/Serializables/ServiceConfig.cs b/ATxCommon/Serializables/ServiceConfig.cs
index 378bf1a5bd4bab786df1bd10fa1a75562c1f3061..bf65c98526a80ab9030fc7b83f13def00ee4b217 100644
--- a/ATxCommon/Serializables/ServiceConfig.cs
+++ b/ATxCommon/Serializables/ServiceConfig.cs
@@ -489,7 +489,7 @@ namespace ATxCommon.Serializables
             var space = "";
             foreach (var drive in SpaceMonitoring) {
                 space += $"    DriveName: {drive.DriveName} " +
-                       $"(threshold: {Conv.MegabytesToString(drive.SpaceThreshold)})\n";
+                       $"(threshold: {Conv.GigabytesToString(drive.SpaceThreshold)})\n";
             }
             if (!string.IsNullOrWhiteSpace(space))
                 msg += $"SpaceMonitoring:\n{space}";
diff --git a/ATxCommon/SystemChecks.cs b/ATxCommon/SystemChecks.cs
index 61ba1f09ebf45c8d135a08b558e2dacff4782c21..1fa1c743b19cad55e37dbe6ddcc68e962309e9fb 100644
--- a/ATxCommon/SystemChecks.cs
+++ b/ATxCommon/SystemChecks.cs
@@ -80,12 +80,16 @@ namespace ATxCommon
             var msg = "";
             foreach (var driveToCheck in drives) {
                 var freeSpace = GetFreeDriveSpace(driveToCheck.DriveName);
-                if (freeSpace >= driveToCheck.SpaceThreshold)
+                if (freeSpace >= driveToCheck.SpaceThreshold * Conv.GigaBytes) {
+                    Log.Trace("Drive [{0}] free space: {1}, above threshold ({2})",
+                        driveToCheck.DriveName, Conv.BytesToString(freeSpace),
+                        Conv.GigabytesToString(driveToCheck.SpaceThreshold));
                     continue;
+                }
 
-                msg += "Drive '" + driveToCheck.DriveName +
-                       "' - free space: " + Conv.BytesToString(freeSpace) +
-                       "  (threshold: " + Conv.BytesToString(driveToCheck.SpaceThreshold) + ")\n";
+                msg += $"Drive [{driveToCheck.DriveName}] " +
+                       $"free space: {Conv.BytesToString(freeSpace)} " +
+                       $"(threshold: {Conv.GigabytesToString(driveToCheck.SpaceThreshold)})\n";
             }
 
             return msg;
diff --git a/ATxService/Email.cs b/ATxService/Email.cs
index c4dfbf487c61d81f1b7cf90df3ee40c2c01c2fd9..9bfcf63bfd083070988036d9f3753d581802c473 100644
--- a/ATxService/Email.cs
+++ b/ATxService/Email.cs
@@ -104,12 +104,14 @@ namespace ATxService
         /// </summary>
         /// <param name="spaceDetails">String describing the drives being low on space.</param>
         private void SendLowSpaceMail(string spaceDetails) {
-            if (string.IsNullOrWhiteSpace(spaceDetails))
+            if (string.IsNullOrWhiteSpace(spaceDetails)) {
+                Log.Trace("SendLowSpaceMail(): spaceDetails emtpy!");
                 return;
+            }
 
             var delta = TimeUtils.MinutesSince(_status.LastStorageNotification);
             if (delta < _config.StorageNotificationDelta) {
-                Log.Trace("Only {0} since last low-space-notification, skipping.",
+                Log.Trace("Last low-space-notification was {0}, skipping.",
                     TimeUtils.MinutesToHuman(delta));
                 return;
             }
diff --git a/Resources/conf/host-specific.template.xml b/Resources/conf/host-specific.template.xml
index 0feb144ea34072fa6b91ef471f62cd04204b59f9..70161d20dac6cee77619f10546066bb505e5a324 100644
--- a/Resources/conf/host-specific.template.xml
+++ b/Resources/conf/host-specific.template.xml
@@ -20,12 +20,12 @@
         <DriveToCheck>
             <!-- DriveName: the drive letter followed by a colon -->
             <DriveName>C:</DriveName>
-            <!-- SpaceThreshold: minimum amount of free megabytes -->
-            <SpaceThreshold>14000</SpaceThreshold>
+            <!-- SpaceThreshold: minimum amount of free gigabytes -->
+            <SpaceThreshold>14</SpaceThreshold>
         </DriveToCheck>
         <!--><DriveToCheck>
             <DriveName>D:</DriveName>
-            <SpaceThreshold>120000</SpaceThreshold>
+            <SpaceThreshold>120</SpaceThreshold>
         </DriveToCheck><-->
     </SpaceMonitoring>