diff --git a/db/migrate/042_change_dates_to_datetimes.rb b/db/migrate/042_change_dates_to_datetimes.rb
index 99e75179..57b62ed5 100644
--- a/db/migrate/042_change_dates_to_datetimes.rb
+++ b/db/migrate/042_change_dates_to_datetimes.rb
@@ -6,18 +6,33 @@ class ChangeDatesToDatetimes < ActiveRecord::Migration
     change_column :recurring_todos, :end_date, :datetime
 
     User.all(:include => [:todos, :recurring_todos]).each do |user|
-      user.todos.each do |todo|
-        todo.update_attribute(:show_from, user.at_midnight(todo.show_from)) unless todo.show_from.nil?
-        todo.update_attribute(:due, user.at_midnight(todo.due)) unless todo.due.nil?
-      end
+      if user.prefs
+        user.todos.each do |todo|
+          todo.update_attribute(:show_from, user.at_midnight(todo.show_from)) unless todo.show_from.nil?
+          todo.update_attribute(:due, user.at_midnight(todo.due)) unless todo.due.nil?
+        end
 
-      user.recurring_todos.each do |todo|
-        todo.update_attribute(:start_from, user.at_midnight(todo.start_from)) unless todo.start_from.nil?
-        todo.update_attribute(:end_date, user.at_midnight(todo.end_date)) unless todo.end_date.nil?
-      end
+        user.recurring_todos.each do |todo|
+          todo.update_attribute(:start_from, user.at_midnight(todo.start_from)) unless todo.start_from.nil?
+          todo.update_attribute(:end_date, user.at_midnight(todo.end_date)) unless todo.end_date.nil?
+        end
+      else # weird...no preferences for this user
+        user.todos.each do |todo|
+          todo.update_attribute(:show_from, at_midnight(todo.show_from)) unless todo.show_from.nil?
+          todo.update_attribute(:due, at_midnight(todo.due)) unless todo.due.nil?
+        end
+
+        user.recurring_todos.each do |todo|
+          todo.update_attribute(:start_from, at_midnight(todo.start_from)) unless todo.start_from.nil?
+          todo.update_attribute(:end_date, at_midnight(todo.end_date)) unless todo.end_date.nil?
+        end
     end
   end
 
+  def at_midnight(date)
+    return Time.zone.local(date.year, date.month, date.day, 0, 0, 0)
+  end
+
   def self.down
     change_column :todos, :show_from, :date
     change_column :todos, :due, :date