diff --git a/db/migrate/20170914154743_fix_password_changed_at_default.rb b/db/migrate/20170914154743_fix_password_changed_at_default.rb
new file mode 100644
index 000000000..dd3eb9aea
--- /dev/null
+++ b/db/migrate/20170914154743_fix_password_changed_at_default.rb
@@ -0,0 +1,10 @@
+class FixPasswordChangedAtDefault < ActiveRecord::Migration
+  def up
+    change_column_default :users, :password_changed_at, Time.new(2015, 1, 1,  1,  1,  1)
+  end
+
+  def down
+    change_column_default :users, :password_changed_at, Time.now
+  end
+
+end
diff --git a/db/schema.rb b/db/schema.rb
index ba856107c..9ad55610c 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: 20170908175149) do
+ActiveRecord::Schema.define(version: 20170914154743) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -974,7 +974,7 @@ ActiveRecord::Schema.define(version: 20170908175149) 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: '2017-09-06 18:19:39', null: false
+    t.datetime "password_changed_at",                       default: '2015-01-01 00: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: ""