diff --git a/tracks/app/models/user.rb b/tracks/app/models/user.rb
index 10881dc4..b1bfa809 100644
--- a/tracks/app/models/user.rb
+++ b/tracks/app/models/user.rb
@@ -60,7 +60,7 @@ class User < ActiveRecord::Base
            :conditions => [ 'state = ?', 'deferred' ],
            :order => 'show_from ASC, todos.created_at DESC' do
               def find_and_activate_ready
-                find(:all, :conditions => ['show_from <= ?', Time.now.beginning_of_day ]).collect { |t| t.activate_and_save! }
+                find(:all, :conditions => ['show_from <= ?', proxy_owner.time ]).collect { |t| t.activate_and_save! }
               end
            end
   has_many :completed_todos,
diff --git a/tracks/test/unit/user_test.rb b/tracks/test/unit/user_test.rb
index 2868318f..a8e8e9ce 100644
--- a/tracks/test/unit/user_test.rb
+++ b/tracks/test/unit/user_test.rb
@@ -235,7 +235,7 @@ class UserTest < Test::Rails::TestCase
 
   def test_find_and_activate_deferred_todos_that_are_ready
     assert_equal 1, @admin_user.deferred_todos.count
-    @admin_user.deferred_todos[0].show_from = Time.now.utc.to_date
+    @admin_user.deferred_todos[0].show_from = @admin_user.time.to_date
     @admin_user.deferred_todos[0].save
     @admin_user.deferred_todos.reload
     @admin_user.deferred_todos.find_and_activate_ready
diff --git a/tracks/vendor/plugins/openid_consumer_plugin/lib/open_id_consumer/controller_methods.rb b/tracks/vendor/plugins/openid_consumer_plugin/lib/open_id_consumer/controller_methods.rb
index 9a61aec9..a9462072 100644
--- a/tracks/vendor/plugins/openid_consumer_plugin/lib/open_id_consumer/controller_methods.rb
+++ b/tracks/vendor/plugins/openid_consumer_plugin/lib/open_id_consumer/controller_methods.rb
@@ -16,7 +16,7 @@
 # under the License.
 
 begin
-  require_gem "ruby-openid", ">= 1.0"
+  gem "ruby-openid", ">= 1.0"
 rescue LoadError
   require "openid"
 end