diff --git a/frappe/patches.txt b/frappe/patches.txt
index 65fcbefc8b..093841f1e5 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -8,10 +8,8 @@ frappe.patches.v7_2.remove_in_filter
 execute:frappe.reload_doc('core', 'doctype', 'doctype', force=True) #2017-09-22
 execute:frappe.reload_doc('core', 'doctype', 'docfield', force=True) #2018-02-20
 execute:frappe.reload_doc('core', 'doctype', 'docperm') #2018-05-29
-frappe.patches.v11_0.drop_column_apply_user_permissions
 execute:frappe.reload_doc('core', 'doctype', 'module_def') #2017-09-22
 execute:frappe.reload_doc('core', 'doctype', 'version') #2017-04-01
-execute:frappe.reload_doc('core', 'doctype', 'activity_log')
 frappe.patches.v11_0.copy_fetch_data_from_options
 frappe.patches.v7_1.rename_scheduler_log_to_error_log
 frappe.patches.v6_1.rename_file_data
@@ -20,6 +18,8 @@ frappe.patches.v8_0.drop_is_custom_from_docperm
 frappe.patches.v8_0.update_records_in_global_search #11-05-2017
 frappe.patches.v8_0.update_published_in_global_search
 execute:frappe.reload_doc('core', 'doctype', 'custom_docperm')
+frappe.patches.v11_0.drop_column_apply_user_permissions
+execute:frappe.reload_doc('core', 'doctype', 'activity_log')
 execute:frappe.reload_doc('core', 'doctype', 'deleted_document')
 execute:frappe.reload_doc('core', 'doctype', 'domain_settings')
 frappe.patches.v8_0.rename_page_role_to_has_role #2017-03-16
@@ -208,7 +208,6 @@ frappe.patches.v10_0.enable_chat_by_default_within_system_settings
 frappe.patches.v10_0.remove_custom_field_for_disabled_domain
 execute:frappe.delete_doc("Page", "chat")
 frappe.patches.v10_0.migrate_passwords_passlib
-frappe.patches.v11_0.drop_column_apply_user_permissions
 frappe.patches.v11_0.rename_standard_reply_to_email_template
 execute:frappe.delete_doc_if_exists('Page', 'user-permissions')
 frappe.patches.v10_0.set_no_copy_to_workflow_state
diff --git a/frappe/patches/v11_0/create_contact_for_user.py b/frappe/patches/v11_0/create_contact_for_user.py
index 86fc62cbff..d584fc939e 100644
--- a/frappe/patches/v11_0/create_contact_for_user.py
+++ b/frappe/patches/v11_0/create_contact_for_user.py
@@ -8,8 +8,9 @@ def execute():
 	frappe.reload_doc('contacts', 'doctype', 'contact')
 
 	users = frappe.get_all('User', filters={"name": ('not in', 'Administrator, Guest')}, fields=["*"])
-	special_characters = "<>"
 	for user in users:
-		user.first_name = re.sub("[{0}]+".format(special_characters), '', str(user.first_name))
-		user.last_name  = re.sub("[{0}]+".format(special_characters), '', str(user.last_name))
+		if user.first_name:
+			user.first_name = re.sub("[<>]+", '', frappe.safe_decode(user.first_name))
+		if user.last_name:
+			user.last_name  = re.sub("[<>]+", '', frappe.safe_decode(user.last_name))
 		create_contact(user)
diff --git a/frappe/patches/v11_0/sync_stripe_settings_before_migrate.py b/frappe/patches/v11_0/sync_stripe_settings_before_migrate.py
index 231333acc4..211e25fb95 100644
--- a/frappe/patches/v11_0/sync_stripe_settings_before_migrate.py
+++ b/frappe/patches/v11_0/sync_stripe_settings_before_migrate.py
@@ -1,21 +1,19 @@
 import frappe
+from frappe.utils.password import get_decrypted_password
 
 def execute():
-	before_migration_settings = frappe.get_doc("Stripe Settings", None)
-	publishable_key = before_migration_settings.publishable_key
-	secret_key = before_migration_settings.get_password(fieldname='secret_key', raise_exception=False)
+	publishable_key = frappe.db.sql("select value from tabSingles where doctype='Stripe Settings' and field='publishable_key'")
+	if publishable_key:
+		secret_key = get_decrypted_password('Stripe Settings', 'Stripe Settings',
+			fieldname='secret_key', raise_exception=False)
+		if secret_key:
+			frappe.reload_doc('integrations', 'doctype', 'stripe_settings')
+			frappe.db.commit()
 
-	if publishable_key is None or secret_key is None:
-		pass
-	else:
+			settings = frappe.new_doc("Stripe Settings")
+			settings.gateway_name = frappe.db.get_value("Global Defaults", None, "default_company") or "Stripe Settings"
+			settings.publishable_key = publishable_key
+			settings.secret_key = secret_key
+			settings.save(ignore_permissions=True)
 
-		frappe.reload_doc('integrations', 'doctype', 'stripe_settings')
-		frappe.db.commit()
-
-		settings = frappe.new_doc("Stripe Settings")
-		settings.gateway_name = frappe.db.get_value("Global Defaults", None, "default_company") if not None else "Stripe Settings"
-		settings.publishable_key = publishable_key
-		settings.secret_key = secret_key
-		settings.save(ignore_permissions=True)
-
-	frappe.db.sql("""DELETE FROM tabSingles WHERE doctype='Stripe Settings'""")
+	frappe.db.sql("""DELETE FROM tabSingles WHERE doctype='Stripe Settings'""")
\ No newline at end of file