fixed forgot password url

2 files changed, 2 insertions, 2 deletions

diff --git a/scipy2017/urls.py b/scipy2017/urls.py
index 2f4adc9..8ec2e59 100755
--- a/scipy2017/urls.py
+++ b/scipy2017/urls.py
@@ -11,7 +11,7 @@ urlpatterns = patterns('',
     url(r'^admin/', include(admin.site.urls)),
     url(r'^', include('website.urls', namespace='website')),
     url(r'^2017/', include('website.urls', namespace='website')),
-    url(r'^2017/', include('website.urls_password_reset')),
+    url(r'^', include('website.urls_password_reset')),
     url(r'^', include('social.apps.django_app.urls', namespace='social')),
     url(r'^', include('django.contrib.auth.urls', namespace='auth'))
 )
diff --git a/website/templates/cfp.html b/website/templates/cfp.html
index adbbae8..aa012a5 100755
--- a/website/templates/cfp.html
+++ b/website/templates/cfp.html
@@ -112,7 +112,7 @@
                   <br/><br/>
                   <a style="padding-right : 20px;" href="{% url 'website:userregister' %}" class="btn btn btn-primary">Create an Account
                   </a>
-                  <a href="/2017/forgotpassword/">Forgot Password?</a>
+                  <a href="/forgotpassword/">Forgot Password?</a>
                   {% csrf_token %}
                </form>
                <!-- </div> -->