diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 64ee8f47c..40a38356d 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -229,19 +229,29 @@ class PreferenceController extends Zend_Controller_Action
                 if (!$isSaas) {
                     if (!Application_Model_Preference::GetMasterDjConnectionUrlOverride()) {
                         $master_connection_url = "http://".$_SERVER['SERVER_NAME'].":".$values["master_harbor_input_port"]."/".$values["master_harbor_input_mount_point"];
-                        Application_Model_Preference::SetMasterDJSourceConnectionURL($master_connection_url);
+                        if (empty($values["master_harbor_input_port"]) || empty($values["master_harbor_input_mount_point"])) {
+                            Application_Model_Preference::SetMasterDJSourceConnectionURL('N/A');
+                        }
+                        else {
+                            Application_Model_Preference::SetMasterDJSourceConnectionURL($master_connection_url);
+                        }
                     } else {
                         Application_Model_Preference::SetMasterDJSourceConnectionURL($values["master_dj_connection_url"]);
                     } 
-				    
+                    
                     if (!Application_Model_Preference::GetLiveDjConnectionUrlOverride()) {  
                         $live_connection_url = "http://".$_SERVER['SERVER_NAME'].":".$values["dj_harbor_input_port"]."/".$values["dj_harbor_input_mount_point"];
-                        Application_Model_Preference::SetLiveDJSourceConnectionURL($live_connection_url);
+                        if (empty($values["dj_harbor_input_port"]) || empty($values["dj_harbor_input_mount_point"])) {
+                            Application_Model_Preference::SetLiveDJSourceConnectionURL('N/A');
+                        }
+                        else {
+                            Application_Model_Preference::SetLiveDJSourceConnectionURL($live_connection_url);
+                        }
                     }
                     else {
                         Application_Model_Preference::SetLiveDJSourceConnectionURL($values["live_dj_connection_url"]);
                     }
-					
+                    
                     // extra info that goes into cc_stream_setting
                     Application_Model_StreamSetting::SetMasterLiveSteamPort($values["master_harbor_input_port"]);
                     Application_Model_StreamSetting::SetMasterLiveSteamMountPoint($values["master_harbor_input_mount_point"]);
diff --git a/airtime_mvc/application/forms/LiveStreamingPreferences.php b/airtime_mvc/application/forms/LiveStreamingPreferences.php
index f4e942e10..cbedf9547 100644
--- a/airtime_mvc/application/forms/LiveStreamingPreferences.php
+++ b/airtime_mvc/application/forms/LiveStreamingPreferences.php
@@ -62,7 +62,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         $master_dj_connection_url = new Zend_Form_Element_Text('master_dj_connection_url');
         $master_dj_connection_url->setAttrib('readonly', true)
                                  ->setLabel('Master Source Connection URL')
-                                 ->setValue(Application_Model_StreamSetting::GetConnectionUrls('master'))
+                                 ->setValue(Application_Model_Preference::GetMasterDJSourceConnectionURL())
                                  ->setDecorators(array('ViewHelper'));
         $this->addElement($master_dj_connection_url);
         
@@ -70,7 +70,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         $live_dj_connection_url = new Zend_Form_Element_Text('live_dj_connection_url');
         $live_dj_connection_url->setAttrib('readonly', true)
                                  ->setLabel('Show Source Connection URL')
-                                 ->setValue(Application_Model_StreamSetting::GetConnectionUrls('show'))
+                                 ->setValue(Application_Model_Preference::GetLiveDJSourceConnectionURL())
                                  ->setDecorators(array('ViewHelper'));
         $this->addElement($live_dj_connection_url);
         
@@ -131,8 +131,8 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         
         $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
         $isDemo = isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1;
-        $master_dj_connection_url = Application_Model_StreamSetting::GetConnectionUrls('master');
-        $live_dj_connection_url = Application_Model_StreamSetting::GetConnectionUrls('show');
+        $master_dj_connection_url = Application_Model_Preference::GetMasterDJSourceConnectionURL();
+        $live_dj_connection_url = Application_Model_Preference::GetLiveDJSourceConnectionURL();
 		
         $this->setDecorators(array(
             array('ViewScript', array('viewScript' => 'form/preferences_livestream.phtml', 'master_dj_connection_url'=>$master_dj_connection_url, 'live_dj_connection_url'=>$live_dj_connection_url, 'isSaas' => $isSaas, 'isDemo' => $isDemo))
diff --git a/airtime_mvc/application/models/StreamSetting.php b/airtime_mvc/application/models/StreamSetting.php
index ef66cd32a..d49bbd59a 100644
--- a/airtime_mvc/application/models/StreamSetting.php
+++ b/airtime_mvc/application/models/StreamSetting.php
@@ -279,28 +279,6 @@ class Application_Model_StreamSetting {
         }
         return $out;
     }
-    
-    public static function GetConnectionUrls($p_source_type) {
-        if (strcmp($p_source_type, "master")==0) {
-            $m_port = Application_Model_StreamSetting::GetMasterLiveSteamPort();
-            $m_mount = Application_Model_StreamSetting::GetMasterLiveSteamMountPoint();
-            $master_dj_connection_url = Application_Model_Preference::GetMasterDJSourceConnectionURL();
-            $connection_url = ($master_dj_connection_url == "")?("http://".$_SERVER['SERVER_NAME'].":".$m_port."/".$m_mount):$master_dj_connection_url;
-            if($m_port=="" || $m_mount==""){
-                $connection_url = "N/A";
-            }
-        }
-        else if (strcmp($p_source_type, "show")==0) {
-            $l_port = Application_Model_StreamSetting::GetDJLiveSteamPort();
-            $l_mount = Application_Model_StreamSetting::GetDJLiveSteamMountPoint();
-            $live_dj_connection_url = Application_Model_Preference::GetLiveDJSourceConnectionURL();
-            $connection_url = ($live_dj_connection_url == "")?"http://".$_SERVER['SERVER_NAME'].":".$l_port."/".$l_mount:$live_dj_connection_url;
-            if($l_port=="" || $l_mount==""){
-                $connection_url = "N/A";
-            }
-        }
-        return $connection_url;	
-    }
 
     public static function SetMasterLiveSteamPort($value){
         self::SetValue("master_live_stream_port", $value, "integer");
diff --git a/airtime_mvc/application/models/airtime/CcShowInstances.php b/airtime_mvc/application/models/airtime/CcShowInstances.php
index e2366cc4f..ed598c5ee 100644
--- a/airtime_mvc/application/models/airtime/CcShowInstances.php
+++ b/airtime_mvc/application/models/airtime/CcShowInstances.php
@@ -162,7 +162,7 @@ class CcShowInstances extends BaseCcShowInstances {
     public function updateDbTimeFilled(PropelPDO $con)
     {
         $timefilled = $this->computeDbTimeFilled($con);
-        if($timefilled == null){
+        if(is_null($timefilled)){
             $timefilled = "00:00:00";
         }
         $this->setDbTimeFilled($timefilled);
diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
index 759702230..3ecf3eff6 100644
--- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js
+++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
@@ -127,7 +127,7 @@ function setLiveSourceConnectionOverrideListener(){
         live_dj_input.val(url)
         live_dj_input.attr("readonly", "readonly")
         live_dj_actions.hide()
-        $.get("/Preference/set-source-connection-url/", {format: "json", type: "livedj", url:encodeURIComponent(url), override: true});
+        $.get("/Preference/set-source-connection-url/", {format: "json", type: "livedj", url:encodeURIComponent(url), override: 1});
     	event.preventDefault()
     })
     
@@ -136,10 +136,13 @@ function setLiveSourceConnectionOverrideListener(){
         var port = $("#dj_harbor_input_port").val()
         var mount = $("#dj_harbor_input_mount_point").val()
         var url = "http://"+location.hostname+":"+port+"/"+mount
+        if (port == '' || mount == '') {
+            url = 'N/A'
+        }
         live_dj_input.val(url)
         live_dj_input.attr("readonly", "readonly")
         live_dj_actions.hide()
-        $.get("/Preference/set-source-connection-url", {format: "json", type: "livedj", url:encodeURIComponent(url), override: false});
+        $.get("/Preference/set-source-connection-url", {format: "json", type: "livedj", url:encodeURIComponent(url), override: 0});
     	event.preventDefault()
     })
     
@@ -148,7 +151,7 @@ function setLiveSourceConnectionOverrideListener(){
         master_dj_input.val(url)
         master_dj_input.attr("readonly", "readonly")
         master_dj_actions.hide()
-        $.get("/Preference/set-source-connection-url", {format: "json", type: "masterdj", url:encodeURIComponent(url), override: true})
+        $.get("/Preference/set-source-connection-url", {format: "json", type: "masterdj", url:encodeURIComponent(url), override: 1})
         event.preventDefault()
     })
     
@@ -156,10 +159,13 @@ function setLiveSourceConnectionOverrideListener(){
         var port = $("#master_harbor_input_port").val()
         var mount = $("#master_harbor_input_mount_point").val()
         var url = "http://"+location.hostname+":"+port+"/"+mount
+        if (port == '' || mount == '') {
+            url = 'N/A'
+        }
         master_dj_input.val(url)
         master_dj_input.attr("readonly", "readonly")
         master_dj_actions.hide()
-        $.get("/Preference/set-source-connection-url", {format: "json", type: "masterdj", url:encodeURIComponent(url), override: false})
+        $.get("/Preference/set-source-connection-url", {format: "json", type: "masterdj", url:encodeURIComponent(url), override: 0})
         event.preventDefault()
     })
 }