diff --git a/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html b/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html
index 9f713507..10b0f95b 100644
--- a/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html
+++ b/foundation/erpnext_foundation/doctype/chapter/templates/chapter.html
@@ -10,23 +10,25 @@
 		<tr>
 			<th>Member Name</th>
 			<th>Member Email</th>
-			<th>Introduction</th>
 			<th>Website URL</th>
-			<th>Enable</th>
 		</tr>
 		{% for user in members %}
 		    <tr>
 		    	<td>{{ frappe.db.get_value('User', user.user, 'full_name') }}</td>
 		    	<td>{{ frappe.db.get_value('User', user.user, 'email') }}</td>
-		    	<td>{{ user.introduction }}</td>
 		    	<td>
 			    	{% if user.website_url %}
-			    		<a href="{{ user.website_url }}">{{ user.website_url }}</a></td>
+			    		<a href="{{ user.website_url }}">{{ user.website_url }}</a>
 			    	{% else %}
 			    		{{ user.website_url }}
 					{% endif %}
-		    	<td><label><input type="checkbox" name="enable" {{ checked if user.enabled == 1 else '' }}></label></td>
+		    	</td>
 	    	</tr>
+	    	<tr>
+	    		<td colspan="3">
+		    		{{ user.introduction }}
+    			</td>
+			</tr>
 			
 		{% endfor %}
 	</table>
diff --git a/foundation/www/join-chapter.html b/foundation/www/join-chapter.html
index b4abcccd..4850376a 100644
--- a/foundation/www/join-chapter.html
+++ b/foundation/www/join-chapter.html
@@ -1,194 +1,59 @@
 {% extends "templates/web.html" %}
 
 {% block page_content %}
+
+{% macro chapter_button() %}
+	<p><a href="/{{ chapter.route }}" class='btn btn-primary'>
+		Go to Chapter Page</a></p>
+{% endmacro %}
 {% if frappe.session.user=='Guest' %}
 	<p>Please signup and login to join this chapter</p>
 	<p><a href="/login?redirect-to=/{{ chapter.route }}" class='btn btn-primary'>Login</a></p>
 {% else %}
 	{% if already_member %}
-	<p>You are already a member of {{ chapter.title }}!</p>
+		<p>You are already a member of {{ chapter.title }}!</p>
+		{{ chapter_button() }}
+		<p><a href="">Leave Chapter</a></p>
 	{% else %}
-	<p>Welcome to chapter {{ chapter.title }}!</p>
-	{% endif %}
-	<div style="padding: 20px 0;">
-		<div class="row">
-			<div class="col-lg-8 col-md-8">
-				<form name="user-intro">
-					<div class="form-group">
-						<input id="chapter_name" name="chapter_name" class="form-control" type="text" value={{chapter.name}} />
+		{% if frappe.local.request.method=='POST' %}
+			<p>Welcome to chapter {{ chapter.title }}!</p>
+			{{ chapter_button() }}
+		{% else %}
+			<div style="padding: 20px 0;">
+				<div class="row">
+					<div class="col-lg-8 col-md-8">
+						<form name="user-intro" action="/join-chapter" method='POST'>
+							<div class="form-group">
+								<input name="name" class="form-control" type="text" 
+									value="{{chapter.name}}">
+								<input name="csrf_token" class="form-control" type="text" 
+									value="{{frappe.session.csrf_token}}">
+							</div>
+							<div class="form-group">
+								<label for="user" class="">User Name</label>
+								<input name="user" class="form-control" type="text" value="{{ frappe.session.user }}">
+							</div>
+							<div class="form-group">
+								<label for="website_url" class="">Website URL</label>
+								<input name="website_url" 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" 
+									placeholder="Your profession and how you are associated with ERPNext"></textarea>
+							</div>
+							<div class="form-group">
+								<button type="Submit" id="update_member" class="btn-primary">
+									Submit</button>
+							</div>
+						</form>
 					</div>
-					<div class="form-group">
-						<label  for="username" class="">User Name</label>
-						<input id="username" name="username" class="form-control" type="text" value={{ frappe.session.user }} />
-					</div>
-					<div class="form-group">
-						<label for="weburl" class="">Website URL</label>
-						<input id="weburl" name="weburl" class="form-control" type="text" placeholder="Please Enter website URL" />
-					</div>
-					<div class="form-group">
-						<label for="introduction" class="">Introduction</label>
-						<textarea id="introduction" name="introduction" class="form-control" placeholder="Please Enter your Introduction"></textarea>
-					</div>
-					<div class="form-group">
-						<button type="Submit" id="update_member" class="btn-primary">Submit</button>
-					</div>
-				</form>
+				</div>
 			</div>
-		</div>
-	</div>
+		{% endif %}
+	{% endif %}
 
-	<p><a href="/{{ chapter.route }}" class='btn btn-primary'>Go to Chapter Page</a></p>
 {% endif %}
 
-<script>
-
-frappe.ready(function() {
-
-	// $("#reset-password").on("submit", function() {
-	// 	return false;
-	// });
-
-	// $("#new_password").on("press", function(e) {
-	// 	if(e.which===13) $("#update").click();
-	// })
-
-	$("#update_member").click(function() {
-		var args = {
-			: get_url_arg("key") || "",
-			weburl: $("#weburl").val(),
-			introduction: $("#introduction").val()
-		}
-
-		// if(!args.old_password && !args.key) {
-		// 	frappe.msgprint("Old Password Required.");
-		// 	return;
-		// }
-		// if(!args.new_password) {
-		// 	frappe.msgprint("New Password Required.")
-		// 	return;
-		// }
-
-		frappe.call({
-			type: "POST",
-			method: "frappe.core.doctype.user.user.update_password",
-			btn: $("#update"),
-			args: args,
-			statusCode: {
-				401: function() {
-					$('.page-card-head .indicator').removeClass().addClass('indicator red')
-						.text(__('Invalid Password'));
-				},
-				200: function(r) {
-					$("input").val("");
-					// strength_indicator.addClass('hidden');
-					// strength_message.addClass('hidden');
-					$('.page-card-head .indicator')
-						// .removeClass().addClass('indicator green')
-						.html(__('Password Updated'));
-					if(r.message) {
-						frappe.msgprint(__("Password Updated"));
-	                    setTimeout(function() {
-							window.location.href = r.message;
-	                    }, 2000);
-					}
-				}
-			}
-		});
-
-        return false;
-	});
-
-	// window.strength_indicator = $('.password-strength-indicator');
-	// window.strength_message = $('.password-strength-message');
-
-	// $('#new_password').on('keyup', function() {
-		// window.clear_timeout();
-		// window.timout_password_strength = setTimeout(window.test_password_strength, 200);
-	// });
-
-	// window.test_password_strength = function() {
-	// 	window.timout_password_strength = null;
-
-	// 	var args = {
-	// 		key: get_url_arg("key") || "",
-	// 		old_password: $("#old_password").val(),
-	// 		new_password: $("#new_password").val()
-	// 	}
-
-	// 	if (!args.new_password) {
-	// 		set_strength_indicator('grey', {'warning': __('Please enter the password') });
-	// 		return;
-	// 	}
-
-	// 	return frappe.call({
-	// 		type: 'GET',
-	// 		method: 'frappe.core.doctype.user.user.test_password_strength',
-	// 		args: args,
-	// 		callback: function(r) {
-	// 			// console.log(r.message);
-	// 		},
-	// 		statusCode: {
-	// 			401: function() {
-	// 				$('.page-card-head .indicator').removeClass().addClass('indicator red')
-	// 					.text(__('Invalid Password'));
-	// 			},
-	// 			200: function(r) {
-	// 				if (r.message && r.message.entropy) {
-	// 					var score = r.message.score,
-	// 						feedback = r.message.feedback;
-
-	// 					feedback.crack_time_display = r.message.crack_time_display;
-	// 					feedback.score = score;
-
-	// 					if(feedback.password_policy_validation_passed){
-	// 						set_strength_indicator('green', feedback);
-	// 					}else{
-	// 						set_strength_indicator('red', feedback);
-	// 					}
-	// 				}
-	// 			}
-	// 		}
-
-	// 	});
-	// };
-
-	// window.set_strength_indicator = function(color, feedback) {
-	// 	var message = [];
-	// 	feedback.help_msg = "";
-	// 	if(!feedback.password_policy_validation_passed){
-	// 		feedback.help_msg = __("Hint: Include symbols, numbers and capital letters in the password");
-	// 	}
-	// 	if (feedback) {
-	// 		if(!feedback.password_policy_validation_passed){
-	// 			if (feedback.suggestions && feedback.suggestions.length) {
-	// 				feedback.suggestions = feedback.suggestions + ' ' + feedback.help_msg;
-	// 				message = message.concat(feedback.suggestions);
-	// 			} else if (feedback.warning) {
-	// 				feedback.warning = feedback.warning + ' ' + feedback.help_msg;
-	// 				message.push(feedback.warning);
-	// 			}
-
-	// 			if (!message.length) {
-	// 				message.push(feedback.help_msg);
-	// 			}
-	// 		}else{
-	// 			message.push(__('Success! You are good to go 👍'));
-	// 		}
-	// 	}
-
-	// 	strength_indicator.removeClass().addClass('password-strength-indicator indicator ' + color);
-	// 	strength_message.text(message.join(' ') || '').removeClass('hidden');
-	// 	// strength_indicator.attr('title', message.join(' ') || '');
-	// }
-
-	window.clear_timeout = function() {
-		if (window.timout_password_strength) {
-			clearTimeout(window.timout_password_strength);
-			window.timout_password_strength = null;
-		}
-	};
-});
-
-</script>
-
 {% endblock %}
\ No newline at end of file
diff --git a/foundation/www/join_chapter.py b/foundation/www/join_chapter.py
index b5a6290d..bc9ba6ba 100644
--- a/foundation/www/join_chapter.py
+++ b/foundation/www/join_chapter.py
@@ -3,13 +3,20 @@ import frappe
 def get_context(context):
 	context.no_cache = True
 	chapter = frappe.get_doc('Chapter', frappe.form_dict.name)
-	print chapter
 	if frappe.session.user!='Guest':
 		if frappe.session.user in [d.user for d in chapter.members]:
 			context.already_member = True
 		else:
-			chapter.append('members', dict(user=frappe.session.user))
-			chapter.save(ignore_permissions=1)
-			frappe.db.commit()
+			if frappe.request.method=='GET':
+				pass
+			elif frappe.request.method=='POST':
+				chapter.append('members', dict(
+					user=frappe.session.user, 
+					introduction=frappe.form_dict.introduction,
+					website_url=frappe.form_dict.website_url,
+					enabled=1
+				))
+				chapter.save(ignore_permissions=1)
+				frappe.db.commit()
 
 	context.chapter = chapter
diff --git a/foundation/www/user-intro.html b/foundation/www/user-intro.html
deleted file mode 100644
index 6777496f..00000000
--- a/foundation/www/user-intro.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "templates/web.html" %}
-
-{% block page_content %}
-
-	<p><a href="" class='btn btn-primary'>Go to Chapter Page</a></p>
-
-{% endblock %}
\ No newline at end of file
diff --git a/foundation/www/user_intro.py b/foundation/www/user_intro.py
deleted file mode 100644
index c5926e1a..00000000
--- a/foundation/www/user_intro.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import frappe
-
-def get_context(context):
-	context.no_cache = True
-	chapter = frappe.get_doc('Chapter', frappe.form_dict.name)
-	print chapter
-	if frappe.session.user!='Guest':
-		if chapter in [d.name for d in chapter]:
-			context.already_member = True
-		else:
-			chapter.append('members', dict(user=frappe.session.user))
-			chapter.save(ignore_permissions=1)
-			frappe.db.commit()
-
-	context.chapter = chapter