diff --git a/db/migrate/20170116000002_fixed_typos_622.rb b/db/migrate/20170116000002_fixed_typos_622.rb
new file mode 100644
index 000000000..cc52bd511
--- /dev/null
+++ b/db/migrate/20170116000002_fixed_typos_622.rb
@@ -0,0 +1,31 @@
+class FixedTypos622 < ActiveRecord::Migration
+  def up
+
+    # return if it's a new setup
+    return if !Setting.find_by(name: 'system_init_done')
+
+    setting = Setting.find_by(name: 'ticket_define_email_from_seperator')
+    return if !setting
+    setting.name = 'ticket_define_email_from_separator'
+    setting.options[:form][0][:name] = 'ticket_define_email_from_separator'
+    setting.save!
+
+    setting_map = {
+      'password_min_size' => 'Password needs to have at least minimal size of characters.',
+      'password_min_2_lower_2_upper_characters' => 'Password needs to contain 2 lower and 2 upper characters.',
+      'password_need_digit' => 'Password needs to have at least one digit.',
+      'ticket_subject_size' => 'Max size of the subject in an email reply.',
+      'postmaster_follow_up_search_in' => 'In default the follow up check is done via the subject of an email. With this setting you can add more fields where the follow up check is executed.',
+    }
+
+    setting_map.each { |key, description|
+      local_setting = Setting.find_by(name: key)
+      next if !local_setting
+      local_setting.description = description
+      local_setting.save!
+    }
+
+    Translation.sync
+
+  end
+end