diff --git a/admin/dst.html b/admin/dst.html
index e04456ebee9..32c0790df1a 100644
--- a/admin/dst.html
+++ b/admin/dst.html
@@ -42,8 +42,10 @@
 <!--
     var DSTPresetInfo = new Array();
     <?php
-        foreach($presetdescriptions as $id => $desc) {
-            echo 'DSTPresetInfo['.$id.'] = "'.$desc.'";';
+        if(!empty($presetdescriptions)) {
+            foreach($presetdescriptions as $id => $desc) {
+                echo 'DSTPresetInfo['.$id.'] = "'.$desc.'";';
+            }
         }
     ?>
 
diff --git a/admin/dst.php b/admin/dst.php
index 813e8303a07..f5b926a4546 100644
--- a/admin/dst.php
+++ b/admin/dst.php
@@ -43,7 +43,11 @@
                 // First delete the preset
                 delete_records('dst_preset', 'id', $presetid);
                 // And then disable DST for all users who had selected that preset
-                execute_sql('UPDATE '.$CFG->prefix.'user_preferences SET value = 0 WHERE name = \'calendar_dstpreset\' AND value = '.$presetid, false);
+                execute_sql('UPDATE '.$CFG->prefix.'user SET dstpreset = 0 WHERE dstpreset = '.$presetid, false);
+                // If it's forced for everyone, release them...
+                if($CFG->calendar_dstforusers == $presetid) {
+                    set_config('calendar_dstforusers', 0);
+                }
             }
         break;
     }