diff --git a/admin/award_awards.php b/admin/award_awards.php
index 67c771df..b4968aa4 100644
--- a/admin/award_awards.php
+++ b/admin/award_awards.php
@@ -208,7 +208,7 @@
 
  case 'feeder_load':
  	$id = intval($_GET['id']);
-	$ret = array();
+	$ret = array('ul'=>array(), 'dl'=>array());
 	/* Prepare two lists of fair IDs, for which fairs can upload and download this award */
 	$q=mysql_query("SELECT * FROM fairs_awards_link WHERE award_awards_id='$id'");
 	while($r=mysql_fetch_assoc($q)) {
@@ -472,9 +472,24 @@ function update_feeder()
 			$("#feeder_identifier").val(json.identifier);
 			$("[name=feeder_dl\\[\\]]").val(json.dl);
 			$("[name=feeder_ul\\[\\]]").val(json.ul);
+
+			if(json.dl.length == 0 && json.ul.length == 0)
+				$('#feeder_enable').val([]);
+			else
+				$('#feeder_enable').val(['yes']);
+			update_feeder_enable();
 		});
+}
 
-
+function update_feeder_enable()
+{
+	var checked = $('#feeder_enable:checkbox').is(':checked');
+	if(checked==true) {
+		$('#feeder_form *').removeAttr('disabled');
+	} else {
+		$("#feeder_form *").attr('disabled', 'disabled');
+		$('#feeder_enable').removeAttr('disabled');
+	}
 }
 
 function feeder_save()
@@ -709,7 +724,7 @@ $(document).ready(function() {
 	<h4><?=i18n("Feeder Fairs")?></h4>
 	<form id="feeder_form">
 	<input type="hidden" id="feeder_id" name="award_awards_id" value=""/>
-	<p><input type="checkbox" id="feeder_enable" name="enable" value="yes" />
+	<p><input type="checkbox" id="feeder_enable" name="enable" value="yes" onchange="update_feeder_enable()" />
 		<?=i18n("Allow feeder fairs to download this award.")?></p>
 	<table class="tableedit">
 		<tr><td><?=i18n('Unique Name')?>:</td>