diff --git a/db/migrate/20150926115929_adds_resilient_locked_until_default.rb b/db/migrate/20150926115929_adds_resilient_locked_until_default.rb
new file mode 100644
index 00000000000..8043110cde0
--- /dev/null
+++ b/db/migrate/20150926115929_adds_resilient_locked_until_default.rb
@@ -0,0 +1,11 @@
+class AddsResilientLockedUntilDefault < ActiveRecord::Migration
+
+  def up
+    change_column_default :locks, :locked_until, Time.new(2000, 1, 1,  1,  1,  1)
+  end
+
+  def down
+    change_column_default :locks, :locked_until, Time.now
+  end
+
+end
diff --git a/db/schema.rb b/db/schema.rb
index 22b6b730ca6..0036eef2a6f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150921095553) do
+ActiveRecord::Schema.define(version: 20150926115929) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -181,7 +181,7 @@
   create_table "locks", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "tries",        default: 0
-    t.datetime "locked_until", default: '2015-09-15 07:56:29', null: false
+    t.datetime "locked_until", default: '2000-01-01 00:01:01', null: false
     t.datetime "created_at",                                   null: false
     t.datetime "updated_at",                                   null: false
   end