diff --git a/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html b/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html
index 10b0f95b..c6691f38 100644
--- a/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html
+++ b/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html
@@ -8,14 +8,14 @@
 {% if members %}
 	<table class="table table-bordered small" style="max-width: 600px;">
 		<tr>
+			<th>Serial No.</th>
 			<th>Member Name</th>
-			<th>Member Email</th>
 			<th>Website URL</th>
 		</tr>
 		{% for user in members %}
 		    <tr>
+		    	<td>{{ i }}</td>
 		    	<td>{{ frappe.db.get_value('User', user.user, 'full_name') }}</td>
-		    	<td>{{ frappe.db.get_value('User', user.user, 'email') }}</td>
 		    	<td>
 			    	{% if user.website_url %}
 			    		<a href="{{ user.website_url }}">{{ user.website_url }}</a>
@@ -29,7 +29,6 @@
 		    		{{ user.introduction }}
     			</td>
 			</tr>
-			
 		{% endfor %}
 	</table>
 {% else %}
@@ -55,6 +54,7 @@
 <p>{{ address }}</p>
 
 <p style="margin: 20px 0 30px;"><a href="/join-chapter?name={{ name }}" class='btn btn-primary'>Join this Chapter</a></p>
+<p style="margin: 20px 0 30px;"><a href="/leave-chapter?name={{ name }}" class=''>Leave this Chapter</a></p>
 
 {% endblock %}
 
diff --git a/foundation/erpnext_foundation/doctype/chapter_member/chapter_member.json b/foundation/erpnext_foundation/doctype/chapter_member/chapter_member.json
index eefae909..c681087c 100644
--- a/foundation/erpnext_foundation/doctype/chapter_member/chapter_member.json
+++ b/foundation/erpnext_foundation/doctype/chapter_member/chapter_member.json
@@ -68,7 +68,7 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -98,7 +98,7 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -128,7 +128,7 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -144,7 +144,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-05-12 16:36:07.139907", 
+ "modified": "2017-05-16 15:24:25.355107", 
  "modified_by": "Administrator", 
  "module": "ERPNext Foundation", 
  "name": "Chapter Member", 
diff --git a/foundation/www/join-chapter.html b/foundation/www/join-chapter.html
index 4850376a..0cc1ab12 100644
--- a/foundation/www/join-chapter.html
+++ b/foundation/www/join-chapter.html
@@ -35,12 +35,12 @@
 							</div>
 							<div class="form-group">
 								<label for="website_url" class="">Website URL</label>
-								<input name="website_url" class="form-control" type="text" 
+								<input name="website_url" required class="form-control" type="text" 
 									placeholder="https://example.com" />
 							</div>
 							<div class="form-group">
 								<label for="introduction" class="">Introduction</label>
-								<textarea name="introduction" class="form-control" 
+								<textarea name="introduction" required class="form-control" 
 									placeholder="Your profession and how you are associated with ERPNext"></textarea>
 							</div>
 							<div class="form-group">
diff --git a/foundation/www/leave-chapter.html b/foundation/www/leave-chapter.html
new file mode 100644
index 00000000..2f8452d5
--- /dev/null
+++ b/foundation/www/leave-chapter.html
@@ -0,0 +1,16 @@
+{% extends "templates/web.html" %}
+<!-- 
+{% macro chapter_button() %}
+	<p><a href="/{{ chapter.route }}" class='btn btn-primary'>
+		Go to Chapter Page</a></p>
+{% endmacro %}
+ -->
+{% block page_content %}
+
+	{% if member_deleted %}
+		<p>You are not a member of {{ chapter.title }}!</p>
+		<p>Please signup and login to join this chapter</p>
+
+		<p><a href="/join-chapter?name={{ chapter.name }}" class='btn btn-primary'>Become Member agian</a></p>
+	{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/foundation/www/leave_chapter.py b/foundation/www/leave_chapter.py
new file mode 100644
index 00000000..96932bba
--- /dev/null
+++ b/foundation/www/leave_chapter.py
@@ -0,0 +1,14 @@
+import frappe
+
+def get_context(context):
+	context.no_cache = True
+	chapter = frappe.get_doc('Chapter', frappe.form_dict.name)
+	# if frappe.session.user!='Guest':
+	if frappe.session.user in [d.user for d in chapter.members]:
+		user = frappe.session.user
+		parent = frappe.form_dict.name
+        frappe.db.sql("""delete from `tabChapter Member` where parent = %s and user = %s """, (parent, user))
+
+	context.member_deleted = True
+
+	context.chapter = chapter