diff --git a/parts/static/script.js b/parts/static/script.js
index 4081da5..9714d0e 100644
--- a/parts/static/script.js
+++ b/parts/static/script.js
@@ -248,7 +248,9 @@ function container_onchange() {
 }
 
 function octopartFetch(){
+	$('#magic-autofill-button').attr('disabled', 'disabled');
 	$.getJSON(rootURL + 'fetchOctopartSnippet/' + $('#partno-input').val()).done(function(json){
+		$('#magic-autofill-button').removeAttr('disabled');
 		if (json['result']=='ok'){
 			$('#description-input').val(json['snippet']);
 		}else{
diff --git a/parts/templates/partsearch.html b/parts/templates/partsearch.html
index 3fbacfb..77b0b3e 100644
--- a/parts/templates/partsearch.html
+++ b/parts/templates/partsearch.html
@@ -59,7 +59,7 @@
         <tr id="partno" class="details-content"><td><p></p><input type="text" name="partno-input" placeholder="Part Number" class="pinfo-input" id="partno-input"/></td></tr>
         <tr id="description-head" class="details-header"><td>DESCRIPTION</td></tr>
         <tr id="description" class="details-content"><td><p></p><input type="text" name="description-input" placeholder="Description" class="pinfo-input" id="description-input"/></td></tr>
-        <tr id="magical_autofill" style="display:none"><td><input type="button" id="magic-autofill-button" onclick="octopartFetch()" value="magical auto-fill powered by OctoPart™" style="margin-bottom:6pt"/></td></tr>
+        <tr id="magical_autofill" style="display:none"><td><input type="button" id="magic-autofill-button" onclick="octopartFetch()" value="magical auto-fill" style="margin-bottom:6pt"/> powered by <a href="http://octopart.com" class="small_link">OctoPart™</a></td></tr>
         <tr id="datasheet-head" class="details-header"><td>DATASHEET: </td></tr>
         <tr id="datasheet" style="display: none"><td><input type="file" accept=".pdf" class="pinfo-input" id="datasheet-finput"></td></tr>
         <tr id="datasheet" style="display: none"><td>OR: <input type="text" class="pinfo-input" name="datasheet-url-input" style="width:80%; margin-bottom: 6pt;" placeholder="Datasheet URL"></td></tr>