diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php
index fd61cf957..60dcccee1 100644
--- a/airtime_mvc/application/forms/GeneralPreferences.php
+++ b/airtime_mvc/application/forms/GeneralPreferences.php
@@ -2,11 +2,16 @@
 
 class Application_Form_GeneralPreferences extends Zend_Form_SubForm
 {
-
+    private $isSaas;	
+	
     public function init()
     {
+        $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
+        $this->isSaas = $isSaas;
+        Logging::log($this->isSaas==true?"true":"false"); 
+        
         $this->setDecorators(array(
-            array('ViewScript', array('viewScript' => 'form/preferences_general.phtml'))
+            array('ViewScript', array('viewScript' => 'form/preferences_general.phtml', "isSaas" => $isSaas))
         ));
 
         $defaultFade = Application_Model_Preference::GetDefaultFade();
diff --git a/airtime_mvc/application/views/scripts/form/preferences_general.phtml b/airtime_mvc/application/views/scripts/form/preferences_general.phtml
index b62531480..956b3879e 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_general.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_general.phtml
@@ -72,7 +72,7 @@
             </label>
         </dt>
         <dd id="weekStartDay-element" class="block-display">
-        	<?php $i=0;
+            <?php $i=0;
                   $value = $this->element->getElement('weekStartDay')->getValue();
             ?>
             <select id="weekStartDay" name="weekStartDay">
@@ -94,35 +94,37 @@
         </dd>
         
         <!-- Enable System Email option -->
-        <dt id="enableSystemEmail-label" class="block-display">
-            <label class="required" for="timezone"><?php echo $this->element->getElement('enableSystemEmail')->getLabel() ?>:
-            </label>
-        </dt>
-        <dd id="enableSystemEmail-element" class="block-display">
-        	<?php echo $this->element->getElement('enableSystemEmail') ?>
-            <?php if($this->element->getElement('enableSystemEmail')->hasErrors()) : ?>
-                <ul class='errors'>
-                    <?php foreach($this->element->getElement('enableSystemEmail')->getMessages() as $error): ?>
-                        <li><?php echo $error; ?></li>
-                    <?php endforeach; ?>
-                </ul>
-            <?php endif; ?>
-        </dd>
-        
-        <!-- System Email option -->
-        <dt id="systemEmail-label" class="block-display">
-            <label class="required" for="timezone"><?php echo $this->element->getElement('systemEmail')->getLabel() ?>:
-            </label>
-        </dt>
-        <dd id="systemEmail-element" class="block-display">
-        	<?php echo $this->element->getElement('systemEmail') ?>
-            <?php if($this->element->getElement('systemEmail')->hasErrors()) : ?>
-                <ul class='errors'>
-                    <?php foreach($this->element->getElement('systemEmail')->getMessages() as $error): ?>
-                        <li><?php echo $error; ?></li>
-                    <?php endforeach; ?>
-                </ul>
-            <?php endif; ?>
-        </dd>
+        <?php if( !$this->isSaas ){?>
+            <dt id="enableSystemEmail-label" class="block-display">
+                <label class="required" for="timezone"><?php echo $this->element->getElement('enableSystemEmail')->getLabel() ?>:
+                </label>
+            </dt>
+            <dd id="enableSystemEmail-element" class="block-display">
+                <?php echo $this->element->getElement('enableSystemEmail') ?>
+                <?php if($this->element->getElement('enableSystemEmail')->hasErrors()) : ?>
+                    <ul class='errors'>
+                        <?php foreach($this->element->getElement('enableSystemEmail')->getMessages() as $error): ?>
+                            <li><?php echo $error; ?></li>
+                        <?php endforeach; ?>
+                    </ul>
+                <?php endif; ?>
+            </dd>
+            
+            <!-- System Email option -->
+            <dt id="systemEmail-label" class="block-display">
+                <label class="required" for="timezone"><?php echo $this->element->getElement('systemEmail')->getLabel() ?>:
+                </label>
+            </dt>
+            <dd id="systemEmail-element" class="block-display">
+                <?php echo $this->element->getElement('systemEmail') ?>
+                <?php if($this->element->getElement('systemEmail')->hasErrors()) : ?>
+                    <ul class='errors'>
+                        <?php foreach($this->element->getElement('systemEmail')->getMessages() as $error): ?>
+                            <li><?php echo $error; ?></li>
+                        <?php endforeach; ?>
+                    </ul>
+                <?php endif; ?>
+            </dd>
+        <?php } ?>
     </dl>
 </fieldset>