diff --git a/app/models/recurring_todo.rb b/app/models/recurring_todo.rb
index f8f22526..cb5f4173 100644
--- a/app/models/recurring_todo.rb
+++ b/app/models/recurring_todo.rb
@@ -596,7 +596,7 @@ class RecurringTodo < ActiveRecord::Base
     unless self.number_of_occurences.nil?
       return self.occurences_count < self.number_of_occurences
     else
-      if self.end_date.nil?
+      if self.end_date.nil? || self.ends_on == 'no_end_date'
         return true
       else
         case self.target
diff --git a/app/views/recurring_todos/_recurring_todo_form.erb b/app/views/recurring_todos/_recurring_todo_form.erb
index 386d2c80..177850a5 100644
--- a/app/views/recurring_todos/_recurring_todo_form.erb
+++ b/app/views/recurring_todos/_recurring_todo_form.erb
@@ -78,7 +78,7 @@
         <label for="recurring_todo[ends_on]">Ends on:</label><br/>
         <%= radio_button_tag('recurring_todo[ends_on]', 'no_end_date', true)%> No end date<br/>
         <%= radio_button_tag('recurring_todo[ends_on]', 'ends_on_number_of_times')%> Ends after <%= text_field( :recurring_todo, :number_of_occurences, "size" => 3, "tabindex" => 7) %> times<br/>
-        <%= radio_button_tag('recurring_todo[ends_on]', 'ends_on_end_date')%> Ends on <%= text_field(:recurring_todo, :end_date, "size" => 12, "class" => "Date", "onfocus" => "Calendar.setup", "tabindex" => 8, "autocomplete" => "off") %><br/>
+        <%= radio_button_tag('recurring_todo[ends_on]', 'ends_on_end_date')%> Ends on <%= text_field(:recurring_todo, :end_date, "size" => 12, "class" => "Date", "onfocus" => "Calendar.setup", "tabindex" => 8, "autocomplete" => "off", "value" => "") %><br/>
     </div></div>
     <div id="recurring_daily" style="display:block">
       <label>Settings for daily recurring actions</label><br/>
diff --git a/test/functional/recurring_todos_controller_test.rb b/test/functional/recurring_todos_controller_test.rb
index 2bd67e67..7b0bd86d 100644
--- a/test/functional/recurring_todos_controller_test.rb
+++ b/test/functional/recurring_todos_controller_test.rb
@@ -155,7 +155,7 @@ class RecurringTodosControllerTest < ActionController::TestCase
       "recurring_period"=>"yearly",
       "recurring_show_days_before"=>"0",
       "recurring_target"=>"due_date",
-      "start_from"=>"",
+      "start_from"=>"1/10/2012",  # adjust after 2012
       "weekly_every_x_week"=>"1",
       "weekly_return_monday"=>"w",
       "yearly_day_of_week"=>"0",
@@ -176,8 +176,8 @@ class RecurringTodosControllerTest < ActionController::TestCase
     new_todo = Todo.find_by_description("new recurring pattern")
     assert !new_todo.nil?
     
-    # the date should be 29 march 2009
-    assert_equal Time.zone.local(2009,3,29), new_todo.due
+    # the date should be 31 march 2013
+    assert_equal Time.zone.local(2013,3,31), new_todo.due
   end
     
 end
diff --git a/test/unit/recurring_todo_test.rb b/test/unit/recurring_todo_test.rb
index b223b2a1..9498216b 100644
--- a/test/unit/recurring_todo_test.rb
+++ b/test/unit/recurring_todo_test.rb
@@ -81,6 +81,7 @@ class RecurringTodoTest < Test::Rails::TestCase
     assert_equal true, @every_day.has_next_todo(@in_three_days)
     assert_equal true, @every_day.has_next_todo(@in_four_days)
     @every_day.end_date = @in_four_days
+    @every_day.ends_on = 'ends_on_end_date'
     assert_equal false, @every_day.has_next_todo(@in_four_days)
   end