Index: JvValidators.pas
===================================================================
--- JvValidators.pas	(revision 6925)
+++ JvValidators.pas	(working copy)
@@ -787,9 +787,14 @@
       { Get all controls that should be validated }
       if FErrorIndicator <> nil then
         for I := 0 to Count - 1 do
-          if Items[I].Enabled and (Items[I].ControlToValidate <> nil) then
-            if Controls.IndexOf(Items[I].ControlToValidate) = -1 then
-              Controls.Add(Items[I].ControlToValidate);
+        begin
+          ErrCtrl := Items[i].ErrorControl;
+          if ErrCtrl = nil then
+            ErrCtrl := Items[i].ControlToValidate;
+          if ErrCtrl <> nil then
+            if Controls.IndexOf(ErrCtrl) = -1 then
+              Controls.Add(ErrCtrl);
+        end;
 
       for I := 0 to Count - 1 do
       begin
@@ -809,7 +814,7 @@
               if ErrorIndicator <> nil then
                 FErrorIndicator.SetError(ErrCtrl, Items[I].ErrorMessage);
               if FErrorIndicator <> nil then
-                Controls.Remove(Items[I].ControlToValidate); { control is not valid }
+                Controls.Remove(ErrCtrl); { control is not valid }
             end;
             Result := False;
             if not DoValidateFailed(Items[I]) then