diff --git a/app/models/recurring_todo.rb b/app/models/recurring_todo.rb
index ad5c09d2..86c549f1 100644
--- a/app/models/recurring_todo.rb
+++ b/app/models/recurring_todo.rb
@@ -47,8 +47,7 @@ class RecurringTodo < ActiveRecord::Base
   end
 
   def validate_daily
-    errors.add_to_base("Please choose a recurrence setting") if daily_selector.nil? || daily_selector.blank?
-    if (daily_selector == "daily_every_x_day") && (daily_every_x_days.nil? || daily_every_x_days.blank?)
+    if (!only_work_days) && (daily_every_x_days.nil? || daily_every_x_days.blank?)
       errors.add_to_base("Every other nth day may not be empty for recurrence setting")
     end
   end
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index fc3122a9..cfe11d2e 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -14,16 +14,14 @@ var TracksForm = {
         toggleDiv.toggleClass('hide_form');
     }, 
     hide_all_recurring: function () {
-        $('#recurring_daily').hide();
-        $('#recurring_weekly').hide();
-        $('#recurring_monthly').hide();
-        $('#recurring_yearly').hide();
+        $.each(['daily', 'weekly', 'monthly', 'yearly'], function(){
+          $('#recurring_'+this).hide();
+        });
     },
     hide_all_edit_recurring: function () {
-        $('#recurring_edit_daily').hide();
-        $('#recurring_edit_weekly').hide();
-        $('#recurring_edit_monthly').hide();
-        $('#recurring_edit_yearly').hide();
+        $.each(['daily', 'weekly', 'monthly', 'yearly'], function(){
+          $('#recurring_edit_'+this).hide();
+        });
     },
     toggle_overlay: function () {
         el = document.getElementById("overlay");
@@ -435,16 +433,12 @@ $(document).ready(function() {
       TracksForm.toggle_overlay();
   });
   $("#recurring_edit_period input").live('click', function(){
-      $.each(['daily', 'weekly', 'monthly', 'yearly'], function(){
-        $('#recurring_edit_'+this).hide();
-        });
+      TracksForm.hide_all_edit_recurring();
       $('#recurring_edit_'+this.id.split('_')[5]).show();
     });
 
   $("#recurring_period input").live('click', function(){
-      $.each(['daily', 'weekly', 'monthly', 'yearly', 'target'], function(){
-        $('#recurring_'+this).hide();
-        });
+      TracksForm.hide_all_recurring();
       $('#recurring_'+this.id.split('_')[4]).show();
     });