diff --git a/image_captcha/image_captcha.js b/image_captcha/image_captcha.js
index 8e10d8f515c3c7b0b3a7b94d809ec966a84d46b1..9ca45b7121bd8bb7c579267c3fd487c27d281c35 100644
--- a/image_captcha/image_captcha.js
+++ b/image_captcha/image_captcha.js
@@ -1,42 +1,42 @@
 // $Id$
 
-(function ($) {
+(function($) {
 
-//TODO: change this to Drupal.behaviors.captchaadmin = function (context) {}
-$(document).ready(function(){
+  Drupal.behaviors.captchaAdmin = {
+    attach : function(context) {
 
-	// Helper function to show/hide noise level widget.
-	var noise_level_shower = function(speed) {
-		speed = (typeof speed == 'undefined') ? 'slow' : speed;
-		if ($("#edit-image-captcha-dot-noise").is(":checked") || $("#edit-image-captcha-line-noise").is(":checked")) {
-			$("#edit-image-captcha-noise-level-wrapper").show(speed);
-		}
-		else {
-			$("#edit-image-captcha-noise-level-wrapper").hide(speed);
-		}
-	}
-	// Add onclick handler to the dot and line noise check boxes.
-	$("#edit-image-captcha-dot-noise").click(noise_level_shower);
-	$("#edit-image-captcha-line-noise").click(noise_level_shower);
-	// Show or hide appropriately on page load.
-	noise_level_shower(0);
+      // Helper function to show/hide noise level widget.
+      var noise_level_shower = function(speed) {
+        speed = (typeof speed == 'undefined') ? 'slow' : speed;
+        if ($("#edit-image-captcha-dot-noise").is(":checked")
+            || $("#edit-image-captcha-line-noise").is(":checked")) {
+          $(".form-item-image-captcha-noise-level").show(speed);
+        } else {
+          $(".form-item-image-captcha-noise-level").hide(speed);
+        }
+      }
+      // Add onclick handler to the dot and line noise check boxes.
+      $("#edit-image-captcha-dot-noise").click(noise_level_shower);
+      $("#edit-image-captcha-line-noise").click(noise_level_shower);
+      // Show or hide appropriately on page load.
+      noise_level_shower(0);
 
-	// Helper function to show/hide smooth distortion widget.
-	var smooth_distortion_shower = function(speed) {
-		speed = (typeof speed == 'undefined') ? 'slow' : speed;
-		if ($("#edit-image-captcha-distortion-amplitude").val() > 0) {
-			$("#edit-image-captcha-bilinear-interpolation-wrapper").show(speed);
-		}
-		else {
-			$("#edit-image-captcha-bilinear-interpolation-wrapper").hide(speed);
-		}
-	}
-	// Add onchange handler to the distortion level select widget.
-	$("#edit-image-captcha-distortion-amplitude").change(smooth_distortion_shower);
-	// Show or hide appropriately on page load.
-	smooth_distortion_shower(0)
+      // Helper function to show/hide smooth distortion widget.
+      var smooth_distortion_shower = function(speed) {
+        speed = (typeof speed == 'undefined') ? 'slow' : speed;
+        if ($("#edit-image-captcha-distortion-amplitude").val() > 0) {
+          $(".form-item-image-captcha-bilinear-interpolation").show(speed);
+        } else {
+          $(".form-item-image-captcha-bilinear-interpolation").hide(speed);
+        }
+      }
+      // Add onchange handler to the distortion level select widget.
+      $("#edit-image-captcha-distortion-amplitude").change(
+          smooth_distortion_shower);
+      // Show or hide appropriately on page load.
+      smooth_distortion_shower(0)
 
-});
+    }
+  };
 
 })(jQuery);
-