diff --git a/db/migrate/20171115164152_add_time_zone_to_default_datetimes.rb b/db/migrate/20171115164152_add_time_zone_to_default_datetimes.rb
new file mode 100644
index 000000000..13bc51264
--- /dev/null
+++ b/db/migrate/20171115164152_add_time_zone_to_default_datetimes.rb
@@ -0,0 +1,6 @@
+class AddTimeZoneToDefaultDatetimes < ActiveRecord::Migration
+  def change
+    change_column_default :users, :password_changed_at, DateTime.new(2015, 1, 1,  1,  1,  1, '+00:00')
+    change_column_default :locks, :locked_until, DateTime.new(2000, 1, 1,  1,  1,  1, '+00:00')
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 05faf6f36..f2dd62428 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: 20171025142440) do
+ActiveRecord::Schema.define(version: 20171115164152) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -572,7 +572,7 @@ ActiveRecord::Schema.define(version: 20171025142440) do
   create_table "locks", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "tries",        default: 0
-    t.datetime "locked_until", default: '2000-01-01 00:01:01', null: false
+    t.datetime "locked_until", default: '2000-01-01 01:01:01', null: false
     t.datetime "created_at",                                   null: false
     t.datetime "updated_at",                                   null: false
   end
@@ -1042,7 +1042,7 @@ ActiveRecord::Schema.define(version: 20171025142440) do
     t.boolean  "email_digest",                              default: true
     t.boolean  "email_on_direct_message",                   default: true
     t.boolean  "official_position_badge",                   default: false
-    t.datetime "password_changed_at",                       default: '2015-01-01 00:01:01', null: false
+    t.datetime "password_changed_at",                       default: '2015-01-01 01:01:01', null: false
     t.boolean  "created_from_signature",                    default: false
     t.integer  "failed_email_digests_count",                default: 0
     t.text     "former_users_data_log",                     default: ""