diff --git a/foundation/__init__.py b/foundation/__init__.py
index 631ab748..d90b37a9 100644
--- a/foundation/__init__.py
+++ b/foundation/__init__.py
@@ -8,11 +8,16 @@ import frappe
 
 def get_last_membership():
 	'''Returns last membership if exists'''
+	member = get_member()
+
 	last_membership = frappe.get_all('Membership', 'name,to_date,membership_type',
-		dict(member=frappe.session.user, paid=1), order_by='to_date desc', limit=1)
+		dict(member=member, paid=1), order_by='to_date desc', limit=1)
 
 	return last_membership and last_membership[0]
 
+def get_member():
+	return frappe.db.get_value("Member", {'email': frappe.session.user}, 'name')
+
 def is_member():
 	'''Returns true if the user is still a member'''
 	last_membership = get_last_membership()