diff --git a/erpnext/startup/js/complete_setup.js b/erpnext/startup/js/complete_setup.js
index 9180dfa1197..ff512827e6e 100644
--- a/erpnext/startup/js/complete_setup.js
+++ b/erpnext/startup/js/complete_setup.js
@@ -138,7 +138,7 @@ $.extend(erpnext.complete_setup, {
 		'Dominican Republic', 'East Timor', 'Ecuador', 'Egypt', 'El Salvador', 
 		'Equatorial Guinea', 'Eritrea', 'Estonia', 'Ethiopia', 'Federated States of Micronesia', 
 		'Fiji', 'Finland', 'France', 'Gabon', 'Georgia', 'Germany', 'Ghana', 'Greece', 
-		'Grenada', 'Guatemala', 'Guinea', 'Guinea-Bissau', 'Guyana', 'Haiti', 'Honduras', 
+		'Grenada', 'Guatemala', 'Guinea', 'Guinea-Bissau', 'Guyana', 'Haiti', 'Honduras', 'Hong Kong'
 		'Hungary', 'Iceland', 'India', 'Indonesia', 'Iran', 'Iraq', 'Israel', 'Italy', 
 		'Jamaica', 'Japan', 'Jordan', 'Kazakhstan', 'Kenya', 'Kingdom of the Netherlands', 
 		'Kiribati', 'Kuwait', 'Kyrgyzstan', 'Laos', 'Latvia', 'Lebanon', 'Lesotho', 'Liberia', 
@@ -147,7 +147,7 @@ $.extend(erpnext.complete_setup, {
 		'Mexico', 'Moldova', 'Monaco', 'Mongolia', 'Montenegro', 'Morocco', 'Mozambique', 
 		'Myanmar', 'Namibia', 'Nauru', 'Nepal', 'New Zealand', 'Nicaragua', 'Niger', 'Nigeria', 
 		'North Korea', 'Norway', 'Oman', 'Pakistan', 'Palau', 'Panama', 'Papua New Guinea', 
-		'Paraguay', "People's Republic of China", 'Peru', 'Philippines', 'Poland', 'Portugal', 
+		'Paraguay', "China", 'Peru', 'Philippines', 'Poland', 'Portugal', 
 		'Qatar', 'Republic of Ireland', 'Republic of the Congo', 'Romania', 'Russia', 'Rwanda', 
 		'Saint Kitts and Nevis', 'Saint Lucia', 'Saint Vincent and the Grenadines', 'Samoa', 
 		'San Marino', 'Saudi Arabia', 'Senegal', 'Serbia', 'Seychelles', 'Sierra Leone', 
@@ -252,6 +252,11 @@ $.extend(erpnext.complete_setup, {
 		'Cape Verde': ['Atlantic/Cape_Verde'],
 		'Central African Republic': ['Africa/Bangui'],
 		'Chad': ['Africa/Ndjamena'],
+		'China': ['Asia/Shanghai',
+		                               'Asia/Harbin',
+		                               'Asia/Chongqing',
+		                               'Asia/Urumqi',
+		                               'Asia/Kashgar'],
 		'Chile': ['America/Santiago', 'Pacific/Easter'],
 		'Colombia': ['America/Bogota'],
 		'Comoros': ['Indian/Comoro'],
@@ -292,6 +297,7 @@ $.extend(erpnext.complete_setup, {
 		'Guyana': ['America/Guyana'],
 		'Haiti': ['America/Guatemala'],
 		'Honduras': ['America/Tegucigalpa'],
+		'Hong Kong': ['Asia/Hong_Kong'],
 		'Hungary': ['Europe/Budapest'],
 		'Iceland': ['Atlantic/Reykjavik'],
 		'India': ['Asia/Calcutta'],
@@ -365,11 +371,6 @@ $.extend(erpnext.complete_setup, {
 		'Panama': ['America/Panama'],
 		'Papua New Guinea': ['Pacific/Port_Moresby'],
 		'Paraguay': ['America/Asuncion'],
-		"People's Republic of China": ['Asia/Shanghai',
-		                               'Asia/Harbin',
-		                               'Asia/Chongqing',
-		                               'Asia/Urumqi',
-		                               'Asia/Kashgar'],
 		'Peru': ['America/Lima'],
 		'Philippines': ['Asia/Manila'],
 		'Poland': ['Europe/Warsaw'],