diff --git a/lms/static/sass/multicourse/_account.scss b/lms/static/sass/multicourse/_account.scss
index 97233911fd..3a474aba66 100644
--- a/lms/static/sass/multicourse/_account.scss
+++ b/lms/static/sass/multicourse/_account.scss
@@ -2,7 +2,7 @@
// =====
// page-level
-.view-register, .view-login {
+.view-register, .view-login, .view-passwordreset {
.content-wrapper {
background: $m-gray-l;
@@ -24,7 +24,7 @@
}
// shared
-.login, .register {
+.login, .register, .passwordreset {
padding: ($baseline*1.5);
@include clearfix;
@@ -422,4 +422,9 @@
padding-top: 0;
padding-bottom: 0;
}
+}
+
+// password reset
+.passwordreset {
+
}
\ No newline at end of file
diff --git a/lms/templates/login.html b/lms/templates/login.html
index 991e6e9b9b..e386769dac 100644
--- a/lms/templates/login.html
+++ b/lms/templates/login.html
@@ -75,7 +75,7 @@
- Forgot password?
+ Forgot password?
diff --git a/lms/templates/register.html b/lms/templates/register.html
index 47caad404d..7718edc487 100644
--- a/lms/templates/register.html
+++ b/lms/templates/register.html
@@ -74,7 +74,7 @@
-
We're sorry, our systems seem to be having trouble processing your registration now.
+
We're sorry, our systems seem to be having trouble processing your registration
Someone has been made aware of this issue. Please try again shortly. Please contact us about any concerns you have.
diff --git a/lms/templates/registration/password_reset_confirm.html b/lms/templates/registration/password_reset_confirm.html
index e80955180c..feec3b1b67 100644
--- a/lms/templates/registration/password_reset_confirm.html
+++ b/lms/templates/registration/password_reset_confirm.html
@@ -1,66 +1,111 @@
-{% load compressed %}
-{% load staticfiles %}
+<%inherit file="main.html" />
-
-
-
- Reset password - MITx 6.002x
+<%namespace name='static' file='static_content.html'/>
- {% compressed_css 'application' %}
+<%block name="title">Reset Your edX Password%block>
-
+<%block name="js_extra">
+
+%block>
+
+
- Enter new password
-
+ Reset Your edX Password
+
- Please enter your new password twice so we can verify you typed it in correctly.
+
+ {% if validlink %}
+
+
+