diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index f4dcdd897..e3ef83351 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -265,7 +265,7 @@ class PreferenceController extends Zend_Controller_Action
                 // pulling this from the 2.5.x branch
                 if (!Application_Model_Preference::GetMasterDjConnectionUrlOverride()) {
                     $master_connection_url = "http://".$_SERVER['SERVER_NAME'].":".$values["master_source_port"].$values["master_source_mount"];
-                    if (empty($values["master_source_port"]) || empty($values["master_source_port"])) {
+                    if (empty($values["master_source_port"]) || empty($values["master_source_mount"])) {
                         Application_Model_Preference::SetMasterDJSourceConnectionURL('N/A');
                     } else {
                         Application_Model_Preference::SetMasterDJSourceConnectionURL($master_connection_url);
@@ -291,12 +291,6 @@ class PreferenceController extends Zend_Controller_Action
                 Application_Model_StreamSetting::setDjLiveStreamPort($values["show_source_port"]);
                 Application_Model_StreamSetting::setDjLiveStreamMountPoint($values["show_source_mount"]);
 
-
-
-
-
-
-
                 Application_Model_StreamSetting::setOffAirMeta($values['offAirMeta']);
 
                 // store stream update timestamp
diff --git a/airtime_mvc/application/forms/LiveStreamingPreferences.php b/airtime_mvc/application/forms/LiveStreamingPreferences.php
index 675d6be18..190c1f6ff 100644
--- a/airtime_mvc/application/forms/LiveStreamingPreferences.php
+++ b/airtime_mvc/application/forms/LiveStreamingPreferences.php
@@ -7,7 +7,6 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
     {
         $CC_CONFIG = Config::getConfig();
         $isDemo = isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1;
-        $isStreamConfigable = Application_Model_Preference::GetEnableStreamConf() == "true";
 
         $defaultFade = Application_Model_Preference::GetDefaultTransitionFade();
 
@@ -64,7 +63,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
 
         // Master source connection url parameters
         $masterSourceHost = new Zend_Form_Element_Text('master_source_host');
-        $masterSourceHost->setLabel(_('Host:'))
+        $masterSourceHost->setLabel(_('Master Source Host:'))
             ->setAttrib('readonly', true)
             ->setValue(Application_Model_Preference::GetMasterDJSourceConnectionURL());
         $this->addElement($masterSourceHost);
@@ -96,7 +95,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
 
         // Show source connection url parameters
         $showSourceHost = new Zend_Form_Element_Text('show_source_host');
-        $showSourceHost->setLabel(_('Host:'))
+        $showSourceHost->setLabel(_('Show Source Host:'))
             ->setAttrib('readonly', true)
             ->setValue(Application_Model_Preference::GetLiveDJSourceConnectionURL());
         $this->addElement($showSourceHost);
@@ -153,4 +152,4 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
 
         return $isValid;
     }
-}
\ No newline at end of file
+}
diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
index b4b6989ff..6c6ee0235 100644
--- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js
+++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
@@ -141,9 +141,6 @@ function setLiveSourceConnectionOverrideListener(){
             mount = ('/').concat(mount);
         }
         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();
@@ -167,9 +164,6 @@ function setLiveSourceConnectionOverrideListener(){
             mount = ('/').concat(mount);
         }
         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();