diff --git a/airtime_mvc/application/views/scripts/form/register-dialog.phtml b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
index 94244ae30..f600b3352 100644
--- a/airtime_mvc/application/views/scripts/form/register-dialog.phtml
+++ b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
@@ -172,7 +172,7 @@
                         <?php echo $this->element->getElement('Privacy')->getLabel() ?>
                     </label>
                 <?php }else{?>
-                    <a id="link_to_privacy" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;">Terms and Conditions</a>
+                    <a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;">Terms and Conditions</a>
                 <?php }?>
 			</div>
 	</form>
diff --git a/airtime_mvc/application/views/scripts/form/support-setting.phtml b/airtime_mvc/application/views/scripts/form/support-setting.phtml
index 7234a02ac..b670733e2 100644
--- a/airtime_mvc/application/views/scripts/form/support-setting.phtml
+++ b/airtime_mvc/application/views/scripts/form/support-setting.phtml
@@ -172,7 +172,7 @@
                 </ul>
             <?php endif; ?>
         <?php }else{?>
-            <a id="link_to_privacy" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;">Terms and Conditions</a>
+            <a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;">Terms and Conditions</a>
         <?php }?>
     </div>
 </fieldset>
\ No newline at end of file
diff --git a/airtime_mvc/public/js/airtime/nowplaying/register.js b/airtime_mvc/public/js/airtime/nowplaying/register.js
index 534378a7f..084e933d0 100644
--- a/airtime_mvc/public/js/airtime/nowplaying/register.js
+++ b/airtime_mvc/public/js/airtime/nowplaying/register.js
@@ -36,7 +36,12 @@ $(document).ready(function(){
     });
     
     var button = $("#help_airtime");
-    button.attr('disabled', 'disabled').addClass('ui-state-disabled');
+    
+    if($("#link_to_terms_and_condition").length > 0 ){
+        button.removeAttr('disabled').removeClass('ui-state-disabled');
+    }else{
+        button.attr('disabled', 'disabled' ).addClass('ui-state-disabled');
+    }
     dialog.dialog('open');
     
 
@@ -57,7 +62,7 @@ $(document).ready(function(){
             button.attr('disabled', 'disabled' ).addClass('ui-state-disabled');
         }else{
             pub.removeAttr("disabled");
-            if(privacy.is(':checked')){
+            if(privacy.length == 0 || privacy.is(':checked')){
                 button.removeAttr('disabled').removeClass('ui-state-disabled');
             }
         }
@@ -85,7 +90,7 @@ $(document).ready(function(){
         }
     });
     
-    if($("#SupportFeedback").is(':checked') && $("#Privacy").is(':checked')){
+    if($("#SupportFeedback").is(':checked') && ($("#Privacy").length == 0 || $("#Privacy").is(':checked'))){
         button.removeAttr('disabled').removeClass('ui-state-disabled');
     }else{
         button.attr('disabled', 'disabled' ).addClass('ui-state-disabled');