diff --git a/dist/angular-validator.js b/dist/angular-validator.js
index 4bd5578..a788933 100644
--- a/dist/angular-validator.js
+++ b/dist/angular-validator.js
@@ -33,6 +33,11 @@ angular.module('angularValidator').directive('angularValidator',
                     }
                 });
 
+                // Watch form length to add watches into new form elements
+                scope.$watch(function(){return DOMForm.length;}, function(){
+                    setupWatches(DOMForm);
+                });
+
                 // Setup watches on all form fields 
                 setupWatches(DOMForm);
 
@@ -51,6 +56,12 @@ angular.module('angularValidator').directive('angularValidator',
                 // Setup $watch on a single formfield
                 function setupWatch(elementToWatch) {
 
+                    //Prevent to re-watch the element
+                    if (elementToWatch.isWatchedByValidator){
+                        return;
+                    }
+                    elementToWatch.isWatchedByValidator = true;
+
                     // If element is set to validate on blur then update the element on blur
                     if ("validate-on" in elementToWatch.attributes && elementToWatch.attributes["validate-on"].value === "blur") {
                         angular.element(elementToWatch).on('blur', function() {
diff --git a/dist/angular-validator.min.js b/dist/angular-validator.min.js
index f49c07e..167c8e9 100644
--- a/dist/angular-validator.min.js
+++ b/dist/angular-validator.min.js
@@ -1 +1 @@
-angular.module("angularValidator",[]),angular.module("angularValidator").directive("angularValidator",function(){return{restrict:"A",link:function(a,b){function c(a){for(var b=0;b<a.length;b++)b in a&&d(a[b])}function d(b){"validate-on"in b.attributes&&"blur"===b.attributes["validate-on"].value&&angular.element(b).on("blur",function(){h(b),k(b)}),a.$watch(function(){return b.value+n.submitted+g(b)+e(n[b.name])+f(n[b.name])},function(){"validate-on"in b.attributes&&"dirty"===b.attributes["validate-on"].value?(h(b),k(b)):(n.submitted||n[b.name]&&n[b.name].$valid)&&(h(b),k(b))})}function e(a){return a&&"$dirty"in a?a.$dirty:void 0}function f(a){return a&&"$valid"in a?a.$valid:void 0}function g(b){if("validator"in b.attributes){var c=a.$eval(b.attributes.validator.value);return n[b.name].$setValidity("angularValidator",c),c}}function h(b){var c=function(){return"<i class='fa fa-times'></i> Required"},d=function(){return"<i class='fa fa-times'></i> Invalid"};if(b.name in n){var e=n[b.name];if(e.$dirty||a[b.form.name].submitted){var f=j(b);f&&f.remove(),e.$error.required?angular.element(b).after("required-message"in b.attributes?i(b.attributes["required-message"].value):i(c)):e.$valid||angular.element(b).after("invalid-message"in b.attributes?i(b.attributes["invalid-message"].value):i(d))}}}function i(b){return"<label class='control-label has-error validationMessage'>"+a.$eval(b)+"</label>"}function j(a){for(var b=angular.element(a).parent().children(),c=0;c<b.length;c++)if(angular.element(b[c]).hasClass("validationMessage"))return angular.element(b[c]);return!1}function k(b){if(b.name in n){var c=n[b.name];(c.$dirty||a[b.form.name].submitted)&&(c.$valid?(angular.element(b.parentNode).removeClass("has-error"),angular.element(b).removeClass("has-error")):c.$invalid&&(angular.element(b.parentNode).addClass("has-error"),angular.element(b).addClass("has-error")))}}var l=angular.element(b)[0],m=l.attributes.name.value,n=a[m];n.submitted=!1,b.on("submit",function(b){b.preventDefault(),a.$apply(function(){n.submitted=!0}),n.$valid&&a.$apply(function(){a.$eval(l.attributes["angular-validator-submit"].value)})}),c(l)}}});
\ No newline at end of file
+angular.module("angularValidator",[]),angular.module("angularValidator").directive("angularValidator",function(){return{restrict:"A",link:function(a,b){function c(a){for(var b=0;b<a.length;b++)b in a&&d(a[b])}function d(b){b.isWatchedByValidator||(b.isWatchedByValidator=!0,"validate-on"in b.attributes&&"blur"===b.attributes["validate-on"].value&&angular.element(b).on("blur",function(){h(b),k(b)}),a.$watch(function(){return b.value+n.submitted+g(b)+e(n[b.name])+f(n[b.name])},function(){"validate-on"in b.attributes&&"dirty"===b.attributes["validate-on"].value?(h(b),k(b)):(n.submitted||n[b.name]&&n[b.name].$valid)&&(h(b),k(b))}))}function e(a){return a&&"$dirty"in a?a.$dirty:void 0}function f(a){return a&&"$valid"in a?a.$valid:void 0}function g(b){if("validator"in b.attributes){var c=a.$eval(b.attributes.validator.value);return n[b.name].$setValidity("angularValidator",c),c}}function h(b){var c=function(){return"<i class='fa fa-times'></i> Required"},d=function(){return"<i class='fa fa-times'></i> Invalid"};if(b.name in n){var e=n[b.name];if(e.$dirty||a[b.form.name].submitted){var f=j(b);f&&f.remove(),e.$error.required?angular.element(b).after("required-message"in b.attributes?i(b.attributes["required-message"].value):i(c)):e.$valid||angular.element(b).after("invalid-message"in b.attributes?i(b.attributes["invalid-message"].value):i(d))}}}function i(b){return"<label class='control-label has-error validationMessage'>"+a.$eval(b)+"</label>"}function j(a){for(var b=angular.element(a).parent().children(),c=0;c<b.length;c++)if(angular.element(b[c]).hasClass("validationMessage"))return angular.element(b[c]);return!1}function k(b){if(b.name in n){var c=n[b.name];(c.$dirty||a[b.form.name].submitted)&&(c.$valid?(angular.element(b.parentNode).removeClass("has-error"),angular.element(b).removeClass("has-error")):c.$invalid&&(angular.element(b.parentNode).addClass("has-error"),angular.element(b).addClass("has-error")))}}var l=angular.element(b)[0],m=l.attributes.name.value,n=a[m];n.submitted=!1,b.on("submit",function(b){b.preventDefault(),a.$apply(function(){n.submitted=!0}),n.$valid&&a.$apply(function(){a.$eval(l.attributes["angular-validator-submit"].value)})}),a.$watch(function(){return l.length},function(){c(l)}),c(l)}}});
\ No newline at end of file