diff --git a/create_account.html b/create_account.html
index f64ff106d5..dd0ed7f9f9 100644
--- a/create_account.html
+++ b/create_account.html
@@ -2,7 +2,7 @@
 <div name="enroll_form" id="enroll_form">
 
   <h1>Enroll in 6.002 Circuits &amp; Electronics</h1>
-  <form name="login"  method="get">
+  <form name="enroll" id="enroll_form"  method="get">
     <fieldset><% if 'error' in locals(): e = error %>
 
     <div id="enroll_error" name="enroll_error"></div>
@@ -67,6 +67,6 @@
       </li>
 
     </ol>
-    <input name="create_account_button" id="create_account_button" type="button" value="Create Account">
+    <input name="create_account_button" id="create_account_button" type="submit" value="Create Account">
 </fieldset>  </form>
 </div>
diff --git a/index.html b/index.html
index 8d73c3ad00..7b6c327ad4 100644
--- a/index.html
+++ b/index.html
@@ -103,7 +103,8 @@ $(function() {
     /* Handles when the user hits 'enroll'. Grabs form data. Does AJAX.
             Either shows error, or shows success. */
 
-    $('#create_account_button').click(function() {
+    $('form#enroll_form').submit(function(e) {
+      e.preventDefault();
       var submit_data={};
       $.each($("[id^=ca_]"), function(index,value){
         submit_data[value.name]=value.value;
diff --git a/login.html b/login.html
index eea9d7f26a..601df0a4c6 100644
--- a/login.html
+++ b/login.html
@@ -3,7 +3,7 @@ ${ error }
 
 <div id="login_div">
   <h1>Log in to MITx</h1>
-  <form name="login" action="/login" method="get">
+  <form id="login_form" method="post">
     <div id="login_error"></div>
     <ol>
       <li>
@@ -21,7 +21,7 @@ ${ error }
       </li>
 
     </ol>
-    <input name="submit" id="login_button" type="button" value="Log in">
+    <input name="submit" id="login_button" type="submit" value="Log in">
   </form>
 
   <div class="lost-password">
diff --git a/marketing.html b/marketing.html
index c0e9f51590..dc712f008a 100644
--- a/marketing.html
+++ b/marketing.html
@@ -19,11 +19,11 @@
   <script src="/static/js/html5shiv.js"></script>
   <![endif]-->
 
-	<script type="text/javascript">
-		$(function(){
-			$("a[rel*=leanModal]").leanModal();
-		});
-	</script>
+  <script type="text/javascript">
+    $(function(){
+      $("a[rel*=leanModal]").leanModal();
+    });
+  </script>
 
 <%block name="headextra"/>
 
@@ -66,14 +66,15 @@
   </footer>
 
   <div id="login" class="leanModal_box"><%include file="login.html" /></div>
-  <div id="pwd_reset" class="leanModal_box"><%include file="password_reset_form.html" /></div>
+  <div id="pwd_reset" class="leanModal_box"><%include file="registration/password_reset_form.html" /></div>
   <div id="reset_done" class="leanModal_box"></div>
 
 <script>
 $(document).ready(function(){
     /* Handles when the user tries to log in. Grabs form data. Does AJAX.
        Either shows error, or redirects. */
-  $('#login_button').click(function() {
+  $('form#login_form').submit(function(e) {
+    e.preventDefault();
     var submit_data={};
     $.each($("[id^=li_]"), function(index,value){
       submit_data[value.name]=value.value;
@@ -92,11 +93,21 @@ $(document).ready(function(){
     );
   });
 
-  $('#pwd_reset_button').click(function() {
-    $.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }",
-      "email"  : $('#id_email').val()}, function(data){
-        $('#pwd_reset').html(data);
-    });
+
+  $('form#pwd_reset_form').submit(function(e) {
+    e.preventDefault();
+    var submit_data = {};
+    submit_data['email'] = $('#id_email').val();
+    postJSON('/password_reset/',
+      submit_data,
+      function(json){
+        if (json.success) {
+          $('#pwd_reset').html(json.value);
+        } else {
+          $('#pwd_error').html(json.error);
+        }
+      }
+    );
   });
 
 });
diff --git a/password_reset_form.html b/password_reset_form.html
deleted file mode 100755
index 5c5aaf7853..0000000000
--- a/password_reset_form.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<h1>Password reset</h1>
-
-<p>Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one.</p>
-
-<form action="/password_reset/" method="post">
-  <input type='hidden' name='csrfmiddlewaretoken' value='${ csrf }' />
-  <label for="id_email">E-mail address:</label>
-  <input id="id_email" type="email" name="email" maxlength="75" /> <input type="button" id="pwd_reset_button" value="Reset my password" />
-</form>
diff --git a/registration/password_reset_complete.html b/registration/password_reset_complete.html
old mode 100755
new mode 100644
diff --git a/registration/password_reset_confirm.html b/registration/password_reset_confirm.html
old mode 100755
new mode 100644
diff --git a/registration/password_reset_done.html b/registration/password_reset_done.html
old mode 100755
new mode 100644
index c4cffde474..f47a520e0a
--- a/registration/password_reset_done.html
+++ b/registration/password_reset_done.html
@@ -1,7 +1,3 @@
-{% block content %}
-
 <h1>Password reset successful</h1>
 
 <p>We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly.</p>
-
-{% endblock %}
diff --git a/registration/password_reset_email.html b/registration/password_reset_email.html
old mode 100755
new mode 100644
diff --git a/registration/password_reset_form.html b/registration/password_reset_form.html
old mode 100755
new mode 100644
index 4d73ff8c3a..31464d833e
--- a/registration/password_reset_form.html
+++ b/registration/password_reset_form.html
@@ -2,7 +2,9 @@
 
 <p>Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one.</p>
 
-<form action="" method="post">{% csrf_token %}
-{{ form.email.errors }}
-<p><label for="id_email">E-mail address:</label> {{ form.email }} <input type="submit" value="Reset my password" /></p>
+<form id="pwd_reset_form">
+  <div id="pwd_error"></div>
+  <label for="id_email">E-mail address:</label>
+  <input id="id_email" type="email" name="email" maxlength="75" />
+  <input type="submit" id="pwd_reset_button" value="Reset my password" />
 </form>
diff --git a/sass/_leanmodal.scss b/sass/_leanmodal.scss
index 04d4f09701..bdd1a9bb22 100644
--- a/sass/_leanmodal.scss
+++ b/sass/_leanmodal.scss
@@ -93,7 +93,7 @@ div.leanModal_box {
       }
     }
 
-    input[type="button"] {
+    input[type="button"], input[type="submit"] {
       @include button($mit-red);
       font-size: 18px;
       padding: lh(.5);