diff --git a/application/controllers/PreferenceController.php b/application/controllers/PreferenceController.php
index cbfa1d26b..b6a6f5bea 100644
--- a/application/controllers/PreferenceController.php
+++ b/application/controllers/PreferenceController.php
@@ -24,22 +24,18 @@ class PreferenceController extends Zend_Controller_Action
         }
                 
         $form = new Application_Form_Preferences();
-        if (!$form->isValid($request->getPost())) {
+        if ($form->isValid($request->getPost())) {
 
-        } else {
             $values = $form->getValues();
-            Application_Model_Preference::SetHeadTitle($values["stationName"], $this->view);                
+            Application_Model_Preference::SetHeadTitle($values["stationName"], $this->view); 
+            Application_Model_Preference::SetDefaultFade($values["stationDefaultFade"]);                      
             
             $this->view->statusMsg = "Preferences Updated.";
         }
-         
-
                   
         $this->view->form = $form;
         return $this->render('index'); //render the phtml file
     }
-
-
 }
 
 
diff --git a/application/forms/Preferences.php b/application/forms/Preferences.php
index 3ae783572..f003b75d6 100644
--- a/application/forms/Preferences.php
+++ b/application/forms/Preferences.php
@@ -16,6 +16,16 @@ class Application_Form_Preferences extends Zend_Form
             'validators' => array('NotEmpty'),
             'value' => Application_Model_Preference::GetValue("station_name")
         ));
+
+         // Add login element
+        $this->addElement('text', 'stationDefaultFade', array(
+            'class'      => 'input_text',
+            'label'      => 'Default Fade:',
+            'required'   => false,
+            'filters'    => array('StringTrim'),
+            'validators' => array(array('regex', false, array('/^[0-2][0-3]:[0-5][0-9]:[0-5][0-9](\.\d{1,6})?$/', 'messages' => 'enter a time 00:00:00{.000000}'))),
+            'value' => Application_Model_Preference::GetValue("default_fade")
+        ));
             
         $this->addElement('submit', 'submit', array(
             'class'    => 'ui-button ui-state-default',
@@ -24,4 +34,4 @@ class Application_Form_Preferences extends Zend_Form
         ));
     }
 }
-
+///^[0-2][0-3]:[0-5][0-9]:[0-5][0-9]{.}[0-9]{0-6}/i
diff --git a/application/models/Playlist.php b/application/models/Playlist.php
index 6db198122..726d66b17 100644
--- a/application/models/Playlist.php
+++ b/application/models/Playlist.php
@@ -927,11 +927,21 @@ class Playlist {
      */
     private function insertPlaylistElement($plId, $fileId, $pos, $clipLength, $cuein, $cueout, $fadeIn=NULL, $fadeOut=NULL)
     {
-        if(is_null($fadeIn))
-            $fadeIn = '00:00:00.000';
-        if(is_null($fadeOut))
-            $fadeOut = '00:00:00.000';
+        $defaultFade =  Application_Model_Preference::GetDefaultFade();
 
+        if(is_null($fadeIn)) {
+            if($defaultFade != "")
+                $fadeIn = $defaultFade;    
+            else
+                $fadeIn = '00:00:00.000';
+        }
+        if(is_null($fadeOut)) {
+            if($defaultFade != "")
+                $fadeOut = $defaultFade;    
+            else
+                $fadeOut = '00:00:00.000';
+        }
+            
         $row = new CcPlaylistcontents();
         $row->setDbPlaylistId($plId);
         $row->setDbFileId($fileId);
diff --git a/application/models/Preference.php b/application/models/Preference.php
index 14c3eab26..8a75d9365 100644
--- a/application/models/Preference.php
+++ b/application/models/Preference.php
@@ -78,5 +78,13 @@ class Application_Model_Preference
         return Application_Model_Preference::GetValue("shows_populated_until");
     }
 
+     public static function SetDefaultFade($fade) { 
+        Application_Model_Preference::SetValue("default_fade", $fade); 
+    }
+
+    public static function GetDefaultFade() {
+        return Application_Model_Preference::GetValue("default_fade");
+    }
+
 }