diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 0160d5eac..3224fefbf 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -25,13 +25,11 @@ class PreferenceController extends Zend_Controller_Action
         $this->view->statusMsg = "";
 
         $form = new Application_Form_Preferences();
-
+        
         if ($request->isPost()) {
-
             if ($form->isValid($request->getPost())) {
-
                 $values = $form->getValues();
-
+                
                 Application_Model_Preference::SetHeadTitle($values["preferences_general"]["stationName"], $this->view);
                 Application_Model_Preference::SetDefaultFade($values["preferences_general"]["stationDefaultFade"]);
                 Application_Model_Preference::SetStreamLabelFormat($values["preferences_general"]["streamFormat"]);
@@ -60,10 +58,8 @@ class PreferenceController extends Zend_Controller_Action
                 Application_Model_Preference::SetStationLogo($imagePath);
 
                 $this->view->statusMsg = "<div class='success'>Preferences updated.</div>";
-
             }
         }
-        $this->view->supportFeedback = Application_Model_Preference::GetSupportFeedback();
     	$logo = Application_Model_Preference::GetStationLogo();
 		if($logo){
 			$this->view->logoImg = $logo;
diff --git a/airtime_mvc/application/forms/RegisterAirtime.php b/airtime_mvc/application/forms/RegisterAirtime.php
index 8560bd3a4..02cfe2aa4 100644
--- a/airtime_mvc/application/forms/RegisterAirtime.php
+++ b/airtime_mvc/application/forms/RegisterAirtime.php
@@ -140,8 +140,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
         // checkbox for privacy policy
         $checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy");
         $checkboxPrivacy->setLabel("By checking this box, I agree to Sourcefabric's <a id=\"link_to_privacy\" href=\"\">privacy policy</a>.")
-            ->setDecorators(array('ViewHelper'))
-            ->setValue(1); 
+            ->setDecorators(array('ViewHelper'));
         $this->addElement($checkboxPrivacy);
     }
 }
diff --git a/airtime_mvc/application/forms/SupportPreferences.php b/airtime_mvc/application/forms/SupportPreferences.php
index 8c4ab0a13..0d8da500f 100644
--- a/airtime_mvc/application/forms/SupportPreferences.php
+++ b/airtime_mvc/application/forms/SupportPreferences.php
@@ -128,6 +128,24 @@ class Application_Form_SupportPreferences extends Zend_Form_SubForm
                 'ViewHelper'
             )
         ));
+        
+        // checkbox for privacy policy
+        $checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy");
+        $checkboxPrivacy->setLabel("By checking this box, I agree to Sourcefabric's <a id=\"link_to_privacy\" href=\"\">privacy policy</a>.")
+            ->setDecorators(array('ViewHelper'));
+        $this->addElement($checkboxPrivacy);
+    }
+    
+    // overwriting isValid function
+    public function isValid ($data)
+    {
+        parent::isValid($data);
+        $checkPrivacy = $this->getElement('Privacy');
+        if($data["SupportFeedback"] == "1" && $data["Privacy"] != "1"){
+            $checkPrivacy->addError("You have to agree to privacy policy.");
+            return false;
+        }
+        return true;
     }
 }
 
diff --git a/airtime_mvc/application/views/scripts/form/preferences_support.phtml b/airtime_mvc/application/views/scripts/form/preferences_support.phtml
index fb4f8473d..7d946e185 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_support.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_support.phtml
@@ -15,7 +15,6 @@
                     <?php endforeach; ?>
                 </ul>
             <?php endif; ?> 
-            <div class="info-text">By checking this box, I agree to Sourcefabric's <a id="link_to_privacy" href="">privacy policy</a>.</div>
         </dd>
 		<dd id="publicize-element">
 			<label class="optional" for="Publicise">
@@ -30,7 +29,9 @@
                 </ul>
             <?php endif; ?> 
 		</dd>
+	</dl>
 		<div class="info-text" style="clear: both;padding: 4px 0 4px 15px;"><p> Note: In order to publicise your station, "Send support feedback" must be enabled</p></div>
+	<dl id="public-info" style="display:none;">	
         <dt id="Phone-label" class="block-display">
             <label class="optional" for="Phone"><?php echo $this->element->getElement('Phone')->getLabel() ?></label>
         </dt>
@@ -112,10 +113,11 @@
         <dt id="Logo-label" class="block-display">
             <label class="optional" for="Description"><?php echo $this->element->getElement('Logo')->getLabel() ?></label>
         </dt>
-        <?php if($this->element->getView()->logoImg){?>
-        <div id="Logo-img-container"><img id="logo-img" onload='resizeImg(this);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" /></div>
-        <?php }?>
         <dd id="Logo-element" class="block-display clearfix">
+            <?php if($this->element->getView()->logoImg){?>
+            <div id="Logo-img-container"><img id="logo-img" onload='resizeImg(this);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" /></div>
+            <?php }?>
+            
             <?php echo $this->element->getElement('Logo') ?>
             <div class="info-text"><p>Min. size: 200x200 Max. size: 600x600</p></div>
             <?php if($this->element->getElement('Logo')->hasErrors()) : ?>
@@ -126,7 +128,6 @@
                 </ul>
             <?php endif; ?>
         </dd>
-        
     </dl>
     <h3 class="collapsible-header">
 		<span class="arrow-icon"></span>Show me what I am sending
@@ -139,4 +140,18 @@
 			</dl>
 		</fieldset>
 	</div>
+	<div>
+        <br>
+    	<label class="optional" for="Privacy">
+            <?php echo $this->element->getElement('Privacy') ?>
+            <?php echo $this->element->getElement('Privacy')->getLabel() ?>
+        </label>
+        <?php if($this->element->getElement('Privacy')->hasErrors()) : ?>
+            <ul class='errors'>
+                <?php foreach($this->element->getElement('Privacy')->getMessages() as $error): ?>
+                    <li><?php echo $error; ?></li>
+                <?php endforeach; ?>
+            </ul>
+        <?php endif; ?>
+    </div>
 </fieldset>
diff --git a/airtime_mvc/public/js/airtime/nowplaying/register.js b/airtime_mvc/public/js/airtime/nowplaying/register.js
index a06d5dd1f..d2b4fb18b 100644
--- a/airtime_mvc/public/js/airtime/nowplaying/register.js
+++ b/airtime_mvc/public/js/airtime/nowplaying/register.js
@@ -37,7 +37,9 @@ $(document).ready(function(){
                 }
              ]
         });
-
+        
+        var button = $("#help_airtime");
+        button.attr('disabled', 'disabled').addClass('ui-state-disabled');
         dialog.dialog('open');
     })
 
diff --git a/airtime_mvc/public/js/airtime/preferences/preferences.js b/airtime_mvc/public/js/airtime/preferences/preferences.js
index d2b1f30a4..7c402592d 100644
--- a/airtime_mvc/public/js/airtime/preferences/preferences.js
+++ b/airtime_mvc/public/js/airtime/preferences/preferences.js
@@ -53,6 +53,14 @@ $(document).ready(function() {
     		pub.removeAttr("disabled");
     	}
 	});
+    
+    $("#Publicise").live('click', function(){
+        if($(this).is(':checked')){
+            $("#public-info").show();
+        }else{
+            $("#public-info").hide();
+        }
+    });
 
     showErrorSections();