diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php
index aa6b52b56..472765d26 100644
--- a/airtime_mvc/application/forms/GeneralPreferences.php
+++ b/airtime_mvc/application/forms/GeneralPreferences.php
@@ -7,8 +7,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
     public function init()
     {
         $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
-        $this->isSaas = $isSaas;
-        Logging::log($this->isSaas==true?"true":"false"); 
+        $this->isSaas = $isSaas; 
         
         $this->setDecorators(array(
             array('ViewScript', array('viewScript' => 'form/preferences_general.phtml', "isSaas" => $isSaas))
diff --git a/airtime_mvc/application/forms/LiveStreamingPreferences.php b/airtime_mvc/application/forms/LiveStreamingPreferences.php
index fe318d692..54e934284 100644
--- a/airtime_mvc/application/forms/LiveStreamingPreferences.php
+++ b/airtime_mvc/application/forms/LiveStreamingPreferences.php
@@ -2,7 +2,7 @@
 
 class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
 {
-
+	
     public function init()
     {
         $defaultFade = Application_Model_Preference::GetDefaultTransitionFade();
@@ -85,6 +85,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         $m_mount = Application_Model_StreamSetting::GetMasterLiveSteamMountPoint();
         $l_port = Application_Model_StreamSetting::GetDJLiveSteamPort();
         $l_mount = Application_Model_StreamSetting::GetDJLiveSteamMountPoint();
+        $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
         
         $master_dj_connection_url = Application_Model_Preference::GetMasterDJSourceConnectionURL();
         $live_dj_connection_url = Application_Model_Preference::GetLiveDJSourceConnectionURL();
@@ -100,7 +101,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         }
         
         $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))
+        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))
         ));
     }
     
@@ -149,4 +150,4 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         return $isValid;
     }
     
-}
\ No newline at end of file
+}
diff --git a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
index ae3514cdf..428af66fd 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
@@ -1,7 +1,7 @@
 <fieldset class="padded stream-setting-global" style="margin-top: 15px">
     <legend>Input Stream Settings</legend>
     <dl class="zend_form">
-    	<dt id="transition_fade-label">
+        <dt id="transition_fade-label">
             <label class="optional" for="transition_fade"><?php echo $this->element->getElement('transition_fade')->getLabel() ?> :
             </label>
         </dt>
@@ -43,80 +43,90 @@
                 </ul>
             <?php endif; ?> 
         </dd>
-        <dt id="master_harbor_input_port-label">
-            <label class="optional" for="master_harbor_input_port"><?php echo $this->element->getElement('master_harbor_input_port')->getLabel() ?> :
-            </label>
-        </dt>
-        <dd id="master_harbor_input_port-element">
-            <?php echo $this->element->getElement('master_harbor_input_port') ?>
-            <?php if($this->element->getElement('master_harbor_input_port')->hasErrors()) : ?>
-                <ul class='errors'>
-                    <?php foreach($this->element->getElement('master_harbor_input_port')->getMessages() as $error): ?>
-                        <li><?php echo $error; ?></li>
-                    <?php endforeach; ?>
-                </ul>
-            <?php endif; ?> 
-        </dd>
-        <dt id="master_harbor_input_mount_point-label">
-            <label class="optional" for="master_harbor_input_mount_point"><?php echo $this->element->getElement('master_harbor_input_mount_point')->getLabel() ?> :
-            </label>
-        </dt>
-        <dd id="master_harbor_input_mount_point-element">
-            <?php echo $this->element->getElement('master_harbor_input_mount_point') ?>
-            <?php if($this->element->getElement('master_harbor_input_mount_point')->hasErrors()) : ?>
-                <ul class='errors'>
-                    <?php foreach($this->element->getElement('master_harbor_input_mount_point')->getMessages() as $error): ?>
-                        <li><?php echo $error; ?></li>
-                    <?php endforeach; ?>
-                </ul>
-            <?php endif; ?> 
-        </dd>
+        <?php if( !$this->isSaas ){?>
+            <dt id="master_harbor_input_port-label">
+                <label class="optional" for="master_harbor_input_port"><?php echo $this->element->getElement('master_harbor_input_port')->getLabel() ?> :
+                </label>
+            </dt>
+            <dd id="master_harbor_input_port-element">
+                <?php echo $this->element->getElement('master_harbor_input_port') ?>
+                <?php if($this->element->getElement('master_harbor_input_port')->hasErrors()) : ?>
+                    <ul class='errors'>
+                        <?php foreach($this->element->getElement('master_harbor_input_port')->getMessages() as $error): ?>
+                            <li><?php echo $error; ?></li>
+                        <?php endforeach; ?>
+                    </ul>
+                <?php endif; ?> 
+            </dd>
+            <dt id="master_harbor_input_mount_point-label">
+                <label class="optional" for="master_harbor_input_mount_point"><?php echo $this->element->getElement('master_harbor_input_mount_point')->getLabel() ?> :
+                </label>
+            </dt>
+            <dd id="master_harbor_input_mount_point-element">
+                <?php echo $this->element->getElement('master_harbor_input_mount_point') ?>
+                <?php if($this->element->getElement('master_harbor_input_mount_point')->hasErrors()) : ?>
+                    <ul class='errors'>
+                        <?php foreach($this->element->getElement('master_harbor_input_mount_point')->getMessages() as $error): ?>
+                            <li><?php echo $error; ?></li>
+                        <?php endforeach; ?>
+                    </ul>
+                <?php endif; ?> 
+            </dd>
+        <?php } ?>
         <dt id="master_dj_connection_url-label">
             <label class="optional" for="master_dj_connection_url" style="white-space: nowrap">Master Source Connection URL:
             </label>
         </dt>
         <dd id="master_dj_connection_url-element">
-            <span id="stream_url" class="static_text"><?php echo $this->master_dj_connection_url ?></span>  <a href=# id="connection_url_override" style="font-size: 12px;">override</a>&nbsp;&nbsp;
-            <span class="override_help_icon">
-            </span><br>
+            <span id="stream_url" class="static_text"><?php echo $this->master_dj_connection_url ?></span>
+            <?php if( !$this->isSaas ){?>
+                <a href=# id="connection_url_override" style="font-size: 12px;">override</a>&nbsp;&nbsp;
+                <span class="override_help_icon">
+                </span><br>
+            <?php } ?>
             <div id="master_dj_connection_url_tb" style="display:none"><input type="text"><a href=# id="ok" style="font-size: 12px;">OK</a>  <a href=# id="reset" style="font-size: 12px;">RESET</a></div>
         </dd>
-        <dt id="dj_harbor_input_port-label">
-            <label class="optional" for="dj_harbor_input_port"><?php echo $this->element->getElement('dj_harbor_input_port')->getLabel() ?> :
-            </label>
-        </dt>
-        <dd id="dj_harbor_input_port-element">
-            <?php echo $this->element->getElement('dj_harbor_input_port') ?>
-            <?php if($this->element->getElement('dj_harbor_input_port')->hasErrors()) : ?>
-                <ul class='errors'>
-                    <?php foreach($this->element->getElement('dj_harbor_input_port')->getMessages() as $error): ?>
-                        <li><?php echo $error; ?></li>
-                    <?php endforeach; ?>
-                </ul>
-            <?php endif; ?> 
-        </dd>
-        <dt id="dj_harbor_input_mount_point-label">
-            <label class="optional" for="dj_harbor_input_mount_point"><?php echo $this->element->getElement('dj_harbor_input_mount_point')->getLabel() ?> :
-            </label>
-        </dt>
-        <dd id="dj_harbor_input_mount_point-element">
-            <?php echo $this->element->getElement('dj_harbor_input_mount_point') ?>
-            <?php if($this->element->getElement('dj_harbor_input_mount_point')->hasErrors()) : ?>
-                <ul class='errors'>
-                    <?php foreach($this->element->getElement('dj_harbor_input_mount_point')->getMessages() as $error): ?>
-                        <li><?php echo $error; ?></li>
-                    <?php endforeach; ?>
-                </ul>
-            <?php endif; ?> 
-        </dd>
+        <?php if( !$this->isSaas ){?>
+            <dt id="dj_harbor_input_port-label">
+                <label class="optional" for="dj_harbor_input_port"><?php echo $this->element->getElement('dj_harbor_input_port')->getLabel() ?> :
+                </label>
+            </dt>
+            <dd id="dj_harbor_input_port-element">
+                <?php echo $this->element->getElement('dj_harbor_input_port') ?>
+                <?php if($this->element->getElement('dj_harbor_input_port')->hasErrors()) : ?>
+                    <ul class='errors'>
+                        <?php foreach($this->element->getElement('dj_harbor_input_port')->getMessages() as $error): ?>
+                            <li><?php echo $error; ?></li>
+                        <?php endforeach; ?>
+                    </ul>
+                <?php endif; ?> 
+            </dd>
+            <dt id="dj_harbor_input_mount_point-label">
+                <label class="optional" for="dj_harbor_input_mount_point"><?php echo $this->element->getElement('dj_harbor_input_mount_point')->getLabel() ?> :
+                </label>
+            </dt>
+            <dd id="dj_harbor_input_mount_point-element">
+                <?php echo $this->element->getElement('dj_harbor_input_mount_point') ?>
+                <?php if($this->element->getElement('dj_harbor_input_mount_point')->hasErrors()) : ?>
+                    <ul class='errors'>
+                        <?php foreach($this->element->getElement('dj_harbor_input_mount_point')->getMessages() as $error): ?>
+                            <li><?php echo $error; ?></li>
+                        <?php endforeach; ?>
+                    </ul>
+                <?php endif; ?> 
+            </dd>
+        <?php } ?>
         <dt id="live_dj_connection_url-label">
             <label class="optional" for="live_dj_connection_url" style="white-space: nowrap">Show Source Connection URL:
             </label>
         </dt>
         <dd id="live_dj_connection_url-element">
-            <span id="stream_url" class="static_text"><?php echo $this->live_dj_connection_url ?></span>  <a href=# id="connection_url_override" style="font-size: 12px;">override</a>&nbsp;&nbsp;
-            <span class="override_help_icon">
-            </span><br>
+            <span id="stream_url" class="static_text"><?php echo $this->live_dj_connection_url ?></span>
+            <?php if( !$this->isSaas ){?>   
+                <a href=# id="connection_url_override" style="font-size: 12px;">override</a>&nbsp;&nbsp;
+                <span class="override_help_icon">
+                </span><br>
+            <?php } ?>
             <div id="live_dj_connection_url_tb" style="display:none"><input type="text"><a href=# id="ok" style="font-size: 12px;">OK</a>  <a href=# id="reset" style="font-size: 12px;">RESET</a></div>
         </dd>
     </dl>