diff --git a/airtime_mvc/application/forms/AddShowRepeats.php b/airtime_mvc/application/forms/AddShowRepeats.php
index 6045c3d78..a8179ccd8 100644
--- a/airtime_mvc/application/forms/AddShowRepeats.php
+++ b/airtime_mvc/application/forms/AddShowRepeats.php
@@ -83,8 +83,8 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm
     }
 
     public function isValid($formData) {
-        if (parent::isValid($formData)) {
-             return $this->checkReliantFields($formData);
+        if (parent::isValid($formData)) {            
+            return $this->checkReliantFields($formData);
         } else {
             return false;
         }
@@ -95,15 +95,18 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm
         if (!$formData['add_show_no_end']) {
             $start_timestamp = $formData['add_show_start_date'];
             $end_timestamp = $formData['add_show_end_date'];
-
-            $start_epoch = strtotime($start_timestamp);
-            $end_epoch = strtotime($end_timestamp);
-
-            if ($end_epoch < $start_epoch) {
+            $showTimeZone = new DateTimeZone($formData['add_show_timezone']);
+            
+            //We're assuming all data is valid at this point (timezone, etc.).
+            
+            $startDate = new DateTime($start_timestamp, $showTimeZone);
+            $endDate = new DateTime($end_timestamp, $showTimeZone);
+            
+            if ($endDate < $startDate) {
                 $this->getElement('add_show_end_date')->setErrors(array(_('End date must be after start date')));
-
                 return false;
             }
+            return true;
         }
 
         if (!isset($formData['add_show_day_check'])) {
diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index 81ceb1d30..803a516fe 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -67,7 +67,7 @@ class Application_Model_Preference
             elseif ($result == 1) {
             	
                 // result found
-                if (is_null($userId)) {
+                if (!$isUserValue) {
                     // system pref
                     $sql = "UPDATE cc_pref"
                     ." SET subjid = NULL, valstr = :value"
@@ -85,7 +85,7 @@ class Application_Model_Preference
             else {
             	
                 // result not found
-                if (is_null($userId)) {
+                if (!$isUserValue) {
                     // system pref
                     $sql = "INSERT INTO cc_pref (keystr, valstr)"
                     ." VALUES (:key, :value)";