diff --git a/erpnext/non_profit/doctype/member/member.js b/erpnext/non_profit/doctype/member/member.js
index c0468a7..eb74dc1 100644
--- a/erpnext/non_profit/doctype/member/member.js
+++ b/erpnext/non_profit/doctype/member/member.js
@@ -38,8 +38,11 @@
 				]
 			},
 			callback: function (data) {
-				frappe.model.set_value(frm.doctype,frm.docname, "membership_expiry_date", data.message.to_date);
+				if(data.message) {
+					frappe.model.set_value(frm.doctype,frm.docname,
+						"membership_expiry_date", data.message.to_date);
+				}
 			}
 		});
 	}
-});
+});
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/member/member.py b/erpnext/non_profit/doctype/member/member.py
index cc617b5..b9b2dd8 100644
--- a/erpnext/non_profit/doctype/member/member.py
+++ b/erpnext/non_profit/doctype/member/member.py
@@ -6,7 +6,6 @@
 from frappe.model.document import Document
 from frappe.contacts.address_and_contact import load_address_and_contact
 
-STANDARD_USERS = ("Guest", "Administrator")
 
 class Member(Document):
 	def onload(self):
@@ -15,10 +14,7 @@
 
 
 	def validate(self):
-		if self.name not in STANDARD_USERS:
-			self.validate_email_type(self.email)
-			self.validate_email_type(self.name)
-
+		self.validate_email_type(self.email)
 
 	def validate_email_type(self, email):
 		from frappe.utils import validate_email_add