diff --git a/accounts/templates/accounts/auth/register.html b/accounts/templates/accounts/auth/register.html
index 5a3b17a..4183462 100644
--- a/accounts/templates/accounts/auth/register.html
+++ b/accounts/templates/accounts/auth/register.html
@@ -1,9 +1,9 @@
-{% extends 'authbase' %} 
-{% block title_name %}Sign Up {% endblock %}
+{% extends 'accounts/auth/base.html' %} 
 {% block login %}
 <h2>Sign Up</h2>
-<form action="{{ page.auth.register }}" method="POST" class="form" accept-charset="utf-8">
-	{% include "error_comp" %}
+<form action="{% url 'accounts.register' %}" method="POST" class="form" accept-charset="utf-8">
+  {% include "common/components/error.html" %}
+  {% csrf_token %}
   <label class="form__label" for="username">
     Username
     <input
@@ -13,21 +13,21 @@
       required
       id="username"
       type="text"
-	  {% if payload.username %}
-          value={{ payload.username }}
+	  {% if username %}
+          value={{ username }}
       {% endif %}
     />
   </label>
 
   <label class="form__label" for="email">
-    Email(optional)
+    Email
     <input
 		class="form__input"
 		name="email"
 		id="email"
 		type="email"
-	  {% if payload.email %}
-          value={{ payload.email }}
+	  {% if email %}
+          value={{ email }}
       {% endif %}
 
 	/>
@@ -41,9 +41,6 @@
       required
       id="password"
       type="password"
-	  {% if payload.password %}
-          value={{ payload.password }}
-      {% endif %}
     />
   </label>
 
@@ -55,20 +52,15 @@
       required
       id="confirm_password"
       type="password"
-	  {% if payload.confirm_password %}
-          value={{ payload.confirm_password }}
-      {% endif %}
     />
   </label>
   <div class="form__action-container">
-    <a href="/forgot-password">Forgot password?</a>
     <button class="form__submit" type="submit">Sign Up</button>
   </div>
 </form>
 
 <p class="form__alt-action">
   Already have an account?
-  <a href="{{ page.auth.login }}"> Login </a>
+  <a href="{% url 'accounts.login' %}"> Login </a>
 </p>
-{% include "demo_banner" %}
 {% endblock %}