diff --git a/UI/WebServerResources/UIxRecurrenceEditor.js b/UI/WebServerResources/UIxRecurrenceEditor.js
index f30427aff..71832056a 100644
--- a/UI/WebServerResources/UIxRecurrenceEditor.js
+++ b/UI/WebServerResources/UIxRecurrenceEditor.js
@@ -270,37 +270,65 @@ function handleMonthlyRecurrence() {
   return validate;
 }
 
+function validateYearlyRecurrence() {
+	var errors = ["Please specify a numerical value in the Year(s)"
+								+ " field greater or equal to 1.",
+								"Please specify a numerical value in the month day"
+								+ " field greater or equal to 1."];
+
+	var errorToShow = 0;
+	var fieldValue = "" + $('yearlyYearsField').value;
+	if (fieldValue.length > 0) {
+		// We check if the yearlyYearsField really contains an integer
+		var v = parseInt(fieldValue);
+		if (!isNaN(v) && v > 0) {
+			errorToShow = 1;
+			fieldValue = "" + $('yearlyDayField').value;
+			if (fieldValue.length > 0) {
+				// We check if the yearlyYearsField really contains an integer
+				var v = parseInt(fieldValue);
+				if (!isNaN(v) && v > 0) {
+					errorToShow = -1;
+				}
+			}
+		}
+	}
+
+	if (errorToShow > -1)
+		window.alert(errors[errorToShow]);
+
+	return (errorToShow == -1);
+}
+
 function handleYearlyRecurrence() {
   var validate = false;
 
   var radioValue = $('recurrence_form').getRadioValue('yearlyRadioButtonName');
-
   // FIXME - right now we do not support rules
   //         such as Every Second Tuesday of February
   if (radioValue == 1)
     window.alert("This type of recurrence is currently unsupported.");
   else {
-    var showError = true;
-
-    var fieldValue = "" + $('yearlyYearsField').value;
-    if (fieldValue.length > 0) {
-      // We check if the yearlyYearsField really contains an integer
-      var v = parseInt(fieldValue);
-      if (!isNaN(v) && v > 0) {
-				validate = true;
-				showError = false;
-				parent$("repeat1").value = fieldValue;
-				parent$("repeat2").value = radioValue;
-				parent$("repeat3").value = $('yearlyDayField').value;
-				parent$("repeat4").value = $('yearlyMonth1').value;
-				parent$("repeat5").value = $('yearlyRepeat').value;
-				parent$("repeat6").value = $('yearlyDay').value;
-				parent$("repeat7").value = $('yearlyMonth2').value;
-      }
-    }
-
-    if (showError)
-      window.alert("Please specify a numerical value in the Year(s) field greater or equal to 1.");
+		if (validateYearlyRecurrence()) {
+			var fieldValue = "" + $('yearlyYearsField').value;
+			if (fieldValue.length > 0) {
+				// We check if the yearlyYearsField really contains an integer
+				var v = parseInt(fieldValue);
+				if (!isNaN(v) && v > 0) {
+					validate = true;
+					showError = false;
+					parent$("repeat1").value = fieldValue;
+					parent$("repeat2").value = radioValue;
+					parent$("repeat3").value = $('yearlyDayField').value;
+					parent$("repeat4").value = $('yearlyMonth1').value;
+					parent$("repeat5").value = $('yearlyRepeat').value;
+					parent$("repeat6").value = $('yearlyDay').value;
+					parent$("repeat7").value = $('yearlyMonth2').value;
+				}
+			}
+		}
+		else
+			validate = false;
   }
 
   return validate;