diff --git a/foundation/erpnext_foundation/web_form/memberships/memberships.js b/foundation/erpnext_foundation/web_form/memberships/memberships.js
index 0c9d91a0..6a013ea3 100644
--- a/foundation/erpnext_foundation/web_form/memberships/memberships.js
+++ b/foundation/erpnext_foundation/web_form/memberships/memberships.js
@@ -14,14 +14,23 @@ frappe.ready(function() {
 		$('[data-fieldname="amount"]').val(amount[membership_type]);
 	}
 
+	var get_date = (add_year = 0) => {
+		const today = new Date();
+		const year = today.getFullYear() + add_year;
+		const month = ((today.getMonth() + 1) + '').padStart(2, '0');
+		const day = today.getDate();
+		return year + '-' + month + '-' + day;
+	}
+
 	if(frappe.utils.get_url_arg('name')) {
 		$('[data-fieldname="membership_type"]').prop('disabled', true);
 		$('[data-fieldname="currency"]').prop('disabled', true);
 		$('.page-content .btn-form-submit').addClass('hidden');
 	} else {
-		var m = moment();
-		$('[data-fieldname="from_date"]').val(m.format()).trigger('change');
-		$('[data-fieldname="to_date"]').val(m.add(1, 'year').format()).trigger('change');
+		const from_date = get_date();
+		const to_date = get_date(1);
+		$('[data-fieldname="from_date"]').val(from_date).trigger('change');
+		$('[data-fieldname="to_date"]').val(to_date).trigger('change');
 		$('[data-fieldname="membership_type"]').on('change', function() { set_amount(); });
 		$('[data-fieldname="currency"]').val("INR");
 		set_amount();
diff --git a/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.js b/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.js
index 26399c02..2c66b34d 100644
--- a/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.js
+++ b/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.js
@@ -3,8 +3,6 @@ frappe.ready(function() {
 	$(".page-header-actions-block .btn-primary, .page-header-actions-block .btn-default").addClass('hidden');
 	$(".text-right .btn-primary").addClass('hidden');
 
-	var m = moment();
-
 	var set_amount = function() {
 		var membership_type = $('[data-fieldname="membership_type"]').val();
 		var currency = $('[data-fieldname="currency"]').val();
@@ -17,14 +15,24 @@ frappe.ready(function() {
 
 		$('[data-fieldname="amount"]').val(amount[membership_type]);
 	}
-	
-	if(get_url_arg('name')) {
+	var get_date = (add_year = 0) => {
+		const today = new Date();
+		const year = today.getFullYear() + add_year;
+		const month = ((today.getMonth() + 1) + '').padStart(2, '0');
+		const day = today.getDate();
+		return year + '-' + month + '-' + day;
+	}
+
+
+	if(frappe.utils.get_url_arg('name')) {
 		$('[data-fieldname="membership_type"]').prop('disabled', true);
 		$('[data-fieldname="currency"]').prop('disabled', true);
 		$('.page-content .btn-form-submit').addClass('hidden');
 	} else {
-		$('[data-fieldname="from_date"]').val(m.format()).trigger('change');
-		$('[data-fieldname="to_date"]').val(m.add(1, 'year').format()).trigger('change');
+		const from_date = get_date();
+		const to_date = get_date(1);
+		$('[data-fieldname="from_date"]').val(from_date).trigger('change');
+		$('[data-fieldname="to_date"]').val(to_date).trigger('change');
 		$('[data-fieldname="membership_type"]').on('change', function() { set_amount(); });
 		$('[data-fieldname="currency"]').val('USD');
 		set_amount();