diff --git username_check.module username_check.module
index f78a042..4010609 100644
--- username_check.module
+++ username_check.module
@@ -60,7 +60,7 @@ function username_check_form_user_register_alter(&$form) {
   elseif ($mode == 'auto') {
     $module_path = drupal_get_path('module', 'username_check');
     $form_group['name']['#prefix'] = '<div id="username-check-wrapper">';
-    $form_group['name']['#suffix'] = '</div><div id="username-check-message"></div><div id="username-check-informer" class="username-check-informer">&nbsp;</div>';
+    $form_group['name']['#suffix'] = '<div id="username-check-message"></div></div>';
   }
 }
 
diff --git username_check_auto.js username_check_auto.js
index 39f405b..a8778e7 100644
--- username_check_auto.js
+++ username_check_auto.js
@@ -1,24 +1,28 @@
 // $Id: username_check_auto.js,v 1.5 2009/01/23 09:24:03 duke Exp $
 
-Drupal.behaviors.usernameCheckAutoBehavior = function (context) {
-  $('#username-check-wrapper input:not(.username-check-behavior-processed)', context)
+Drupal.usernameCheck = Drupal.usernameCheck || {};
+
+Drupal.behaviors.usernameCheck = function (context) {
+  $('#username-check-wrapper input', context).not('.username-check-behavior-processed')
     .addClass('username-check-behavior-processed')
     .each(function () {
       var loginField = $(this);
-      
-      var usernamePos = loginField.position();
-      var usernameWidth = loginField.width();
-      
-      Drupal.usernameCheckUsername = '';
-      $('#username-check-informer')
-        .css({left: (usernamePos.left+usernameWidth+10)+'px', top: (usernamePos.top)+'px'})
-        .show(); 
+      var username = '';
       
       loginField
+        .show(function() {
+          var usernamePos = loginField.position();
+          var usernameWidth = loginField.width();
+          loginField
+            .after('<div id="username-check-informer" class="username-check-informer">&nbsp;</div>');
+          $('#username-check-informer')
+            .css({left: (usernamePos.left+usernameWidth+10)+'px', top: (usernamePos.top)+'px'})
+            .show();
+        })
         .keyup(function () {
-          if(loginField.val() != Drupal.usernameCheckUsername) {
-            clearTimeout(Drupal.usernameCheckTimer);
-            Drupal.usernameCheckTimer = setTimeout(function () {usernameCheck(loginField)}, Drupal.settings.usernameCheck.delay*1000);
+          if(loginField.val() != username) {
+            clearTimeout(Drupal.usernameCheck.checkTimer);
+            Drupal.usernameCheck.checkTimer = setTimeout(function () {Drupal.usernameCheck.usernameCheck(loginField);}, Drupal.settings.usernameCheck.delay*1000);
           
             if(!$("#username-check-informer").hasClass('username-check-informer-progress')) {
               $("#username-check-informer")
@@ -31,20 +35,20 @@ Drupal.behaviors.usernameCheckAutoBehavior = function (context) {
           }
         })
         .blur(function () {
-          if(loginField.val() != Drupal.usernameCheckUsername) {
-            usernameCheck(loginField);
+          if(loginField.val() != username) {
+            Drupal.usernameCheck.usernameCheck(loginField);
           }
         });    
     });
-}
+};
 
-function usernameCheck(loginField) {
-  clearTimeout(Drupal.usernameCheckTimer);
-  Drupal.usernameCheckUsername = loginField.val();
+Drupal.usernameCheck.usernameCheck = function (loginField) {
+  clearTimeout(Drupal.usernameCheck.checkTimer);
+  var username = loginField.val();
   
   $.ajax({
     url: Drupal.settings.usernameCheck.ajaxUrl,
-    data: {username: Drupal.usernameCheckUsername},
+    data: {username: username},
     dataType: 'json',
     beforeSend: function() {
       $("#username-check-informer")
@@ -53,7 +57,7 @@ function usernameCheck(loginField) {
         .addClass('username-check-informer-progress');
     },
     success: function(ret){
-      if(ret['allowed']){
+      if(ret.allowed){
         $("#username-check-informer")
           .removeClass('username-check-informer-progress')
           .addClass('username-check-informer-accepted');
@@ -68,9 +72,12 @@ function usernameCheck(loginField) {
         
         $("#username-check-message")
           .addClass('username-check-message-rejected')
-          .html(ret['msg'])
+          .html(ret.msg)
           .show();
+
+        loginField
+          .addClass('error');
       }
     }
    });
-}
\ No newline at end of file
+};
\ No newline at end of file