diff --git a/activation_active.html b/activation_active.html
index c51cccbb70..613c20dc9f 100644
--- a/activation_active.html
+++ b/activation_active.html
@@ -6,8 +6,7 @@
 <section class="activation">
   <h1>Account already active!</h1>
   <!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> -->
-  <p> This account has already been activated. We will notify you as
-  soon as the course starts.</p>
-  <p>For now you can go to the <a href="http://mitx.mit.edu/">MITx homepage</a> or the <a href="/">6.002x course page</a>.</p>
+  <p> This account has already been activated. You can log in at
+  the <a href="/">6.002x course page</a>.</p>
 </div>
 </section>
diff --git a/activation_complete.html b/activation_complete.html
index 1a46dc21a9..dc01ae54ca 100644
--- a/activation_complete.html
+++ b/activation_complete.html
@@ -4,7 +4,6 @@
 <div>
   <h1>Activation Complete!</h1>
   <!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> -->
-  <p>Thanks for activating your email. We will notify you as soon as the course starts.</p>
-  <p>For now you can go to the <a href="http://mitx.mit.edu/">MITx homepage</a> or the <a href="/">6.002x course page</a>.</p>
+  <p>Thanks for activating your account. You can log in at the <a href="/">6.002x course page</a>.</p>
 </div>
 </section>
diff --git a/activation_email.txt b/emails/activation_email.txt
similarity index 100%
rename from activation_email.txt
rename to emails/activation_email.txt
diff --git a/activation_email_subject.txt b/emails/activation_email_subject.txt
similarity index 100%
rename from activation_email_subject.txt
rename to emails/activation_email_subject.txt
diff --git a/emails/email_change.txt b/emails/email_change.txt
index 846e4a70e2..32a21bdf0d 100644
--- a/emails/email_change.txt
+++ b/emails/email_change.txt
@@ -1,5 +1,5 @@
 We received a request to change the e-mail associated with MITx
-account ${username} from ${oldemail} to ${newemail}. If this is
+account ${username} from ${old_email} to ${new_email}. If this is
 correct, please confirm your new e-mail address by visiting:
 
 http://${ site }/confirmemail/${ key }
diff --git a/emails/email_change_subject.txt b/emails/email_change_subject.txt
new file mode 100644
index 0000000000..6ab38757f6
--- /dev/null
+++ b/emails/email_change_subject.txt
@@ -0,0 +1 @@
+Request to change MITx account e-mail
diff --git a/emails/reject_name_change.txt b/emails/reject_name_change.txt
new file mode 100644
index 0000000000..5d9edc363b
--- /dev/null
+++ b/emails/reject_name_change.txt
@@ -0,0 +1,5 @@
+(Not currently used)
+
+We are sorry. Our course staff did not approve your request to change
+your name from ${old_name} to ${new_name}. If you need further
+assistance, please e-mail the course staff at ta@mitx.mit.edu.
diff --git a/profile.html b/profile.html
index ef666ff241..c6bb678be3 100644
--- a/profile.html
+++ b/profile.html
@@ -79,8 +79,18 @@ $(function() {
     });
 
 
-    $("#unenroll_button").click(function(){
-      $("#unenroll_course_link").click();
+    $("#submit_email_change").click(function(){
+      alert("Test 1");
+      var new_email = $('#new_email_field').val();
+      var new_password = $('#new_email_password').val();
+
+      postJSON('/email_change/',{"new_email":new_email},
+               function(data){});
+      alert("Test 2");
+       log_event("profile", {"type":"email_change_request", 
+                               "old_email":"${email}",
+                               "new_email":new_email});
+      alert("Test 3");
     });
 
 });
@@ -220,16 +230,16 @@ $(function() {
       <ul>
         <li>
           <label> Please enter your new email address: </label>
-          <input id="new_name" type="email" value="" />
+          <input id="new_email_field" type="email" value="" />
         </li>
 
         <li>
           <label> Please confirm your password: </label>
-          <input id="new_name" value="" type="password" />
+          <input id="new_email_password" value="" type="password" />
         </li>
         <li>
           <p> We will send a confirmation to both ${email} and your new e-mail as part of the process.</p>
-          <input type="submit" id="submit" />
+          <input type="submit" id="submit_email_change" />
         </li>
       </ul>
       </fieldset>