diff --git a/public/js/complete_setup.js b/public/js/complete_setup.js
index f5d0672..f0b21c8 100644
--- a/public/js/complete_setup.js
+++ b/public/js/complete_setup.js
@@ -40,7 +40,7 @@
 				{fieldname:'country', label: 'Country', reqd:1,
 					options: "", fieldtype: 'Select'},
 				{fieldname:'currency', label: 'Default Currency', reqd:1,
-					options: "Currency", fieldtype: 'Link'},
+					options: "", fieldtype: 'Select'},
 				{fieldname:'timezone', label: 'Time Zone', reqd:1,
 					options: "", fieldtype: 'Select'},
 				{fieldname:'industry', label: 'Industry', reqd:1,
@@ -55,11 +55,17 @@
 		}
 		
 		wn.call({
-			method:"webnotes.country_info.get_all",
+			method:"webnotes.country_info.get_country_timezone_info",
 			callback: function(data) {
-				erpnext.country_info = data.message;
+				erpnext.country_info = data.message.country_info;
+				erpnext.all_timezones = data.message.all_timezones;
 				d.get_input("country").empty()
-					.add_options([""].concat(keys(data.message).sort()));
+					.add_options([""].concat(keys(erpnext.country_info).sort()));
+				d.get_input("currency").empty()
+					.add_options(wn.utils.unique([""].concat($.map(erpnext.country_info, 
+						function(opts, country) { return opts.currency; }))).sort());
+				d.get_input("timezone").empty()
+					.add_options([""].concat(erpnext.all_timezones));
 			}
 		})
 		
@@ -82,19 +88,15 @@
 			var country = d.fields_dict.country.input.value;
 			var $timezone = $(d.fields_dict.timezone.input);
 			$timezone.empty();
+			// add country specific timezones first
 			if(country){
-				var timezone_list = erpnext.country_info[country].timezones;
-				if(timezone_list.length==0) {
-					timezone_list = $.map(erpnext.country_info, function(m) {
-						return m.timezones
-					});
-				}
-				$timezone.empty().add_options(timezone_list);
-				
-				console.log(d.get_input("currency"))
+				var timezone_list = erpnext.country_info[country].timezones || [];
+				$timezone.add_options(timezone_list.sort());
 				
 				d.get_input("currency").val(erpnext.country_info[country].currency);
 			}
+			// add all timezones at the end, so that user has the option to change it to any timezone
+			$timezone.add_options([""].concat(erpnext.all_timezones));
 			
 		};
 		
@@ -127,5 +129,5 @@
 	'Finance', 'Food and Beverage', 'Government', 'Healthcare', 'Hospitality',
 	'Information Technology', 'Insurance', 'Machinery', 'Manufacturing', 'Media',
 	'Not For Profit', 'Recreation', 'Retail', 'Shipping', 'Technology',
-	'Telecommunications', 'Transportation', 'Trading', 'Utilities', 'Other'],
+	'Telecommunications', 'Transportation', 'Trading', 'Utilities', 'Other'],	
 });
\ No newline at end of file