diff --git a/frappe/desk/page/setup_wizard/install_fixtures.py b/frappe/desk/page/setup_wizard/install_fixtures.py
index e7e147fb7d..c857bd077f 100644
--- a/frappe/desk/page/setup_wizard/install_fixtures.py
+++ b/frappe/desk/page/setup_wizard/install_fixtures.py
@@ -8,16 +8,22 @@ from frappe import _
 from frappe.desk.doctype.global_search_settings.global_search_settings import update_global_search_doctypes
 
 def install():
-	update_genders_and_salutations()
+	update_genders()
+	update_salutations()
 	update_global_search_doctypes()
 	setup_email_linking()
 
 @frappe.whitelist()
-def update_genders_and_salutations():
-	default_genders = [_("Male"), _("Female"), _("Other")]
-	default_salutations = [_("Mr"), _("Ms"), _('Mx'), _("Dr"), _("Mrs"), _("Madam"), _("Miss"), _("Master"), _("Prof")]
+def update_genders():
+	default_genders = [_("Male"), _("Female"), _("Other"),_("Transgender"), _("Genderqueer"), _("Non-Conforming"),_("Prefer not to say")]
 	records = [{'doctype': 'Gender', 'gender': d} for d in default_genders]
-	records += [{'doctype': 'Salutation', 'salutation': d} for d in default_salutations]
+	for record in records:
+		frappe.get_doc(record).insert(ignore_permissions=True, ignore_if_duplicate=True)
+
+@frappe.whitelist()
+def update_salutations():
+	default_salutations = [_("Mr"), _("Ms"), _('Mx'), _("Dr"), _("Mrs"), _("Madam"), _("Miss"), _("Master"), _("Prof")]
+	records = [{'doctype': 'Salutation', 'salutation': d} for d in default_salutations]
 	for record in records:
 		doc = frappe.new_doc(record.get("doctype"))
 		doc.update(record)
diff --git a/frappe/patches.txt b/frappe/patches.txt
index fc4f3ae998..0e02423639 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -271,3 +271,4 @@ execute:frappe.delete_doc_if_exists('DocType', 'GSuite Templates')
 execute:frappe.delete_doc_if_exists('DocType', 'GCalendar Account')
 execute:frappe.delete_doc_if_exists('DocType', 'GCalendar Settings')
 frappe.patches.v12_0.remove_parent_and_parenttype_from_print_formats
+execute:from frappe.desk.page.setup_wizard.install_fixtures import update_genders;update_genders()
diff --git a/frappe/patches/v8_0/update_gender_and_salutation.py b/frappe/patches/v8_0/update_gender_and_salutation.py
index c990e9c4aa..bcd9d4cbd7 100644
--- a/frappe/patches/v8_0/update_gender_and_salutation.py
+++ b/frappe/patches/v8_0/update_gender_and_salutation.py
@@ -2,7 +2,7 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.desk.page.setup_wizard.install_fixtures import update_genders_and_salutations
+from frappe.desk.page.setup_wizard.install_fixtures import update_genders, update_salutations
 
 def execute():
 	frappe.db.set_value("DocType", "Contact", "module", "Contacts")
@@ -11,4 +11,5 @@ def execute():
 	frappe.reload_doc('contacts', 'doctype', 'gender')
 	frappe.reload_doc('contacts', 'doctype', 'salutation')
 
-	update_genders_and_salutations()
\ No newline at end of file
+	update_genders()
+	update_salutations()
\ No newline at end of file