diff --git a/templates/registration/password_reset_email.html b/templates/registration/password_reset_email.html
index f219c68..6b7358c 100644
--- a/templates/registration/password_reset_email.html
+++ b/templates/registration/password_reset_email.html
@@ -1,5 +1,5 @@
 {% load i18n %}
 {% blocktrans %}Reset password at {{ site_name }}{% endblocktrans %}:
 {% block reset_link %}
-{{ protocol }}://{{ domain }}{% url "auth_password_reset_confirm" uidb36=uid, token=token %}
+{{ protocol }}://{{ domain }}{% url "auth_password_reset_confirm" uidb64=uid token=token %}
 {% endblock %}
diff --git a/urls.py b/urls.py
index fe9bb22..f79bc9b 100644
--- a/urls.py
+++ b/urls.py
@@ -9,12 +9,34 @@
 import settings
 from django.conf.urls import patterns, include, url
 from django.views.generic import RedirectView
+from django.contrib.auth import views as auth_views
 
 from django.contrib import admin
 admin.autodiscover()
 
 urlpatterns = patterns('',
     url(r'^admin/', include(admin.site.urls)),
+
+    # override the default auth urls since django-registration 1.0 isn't Django 1.6 compatible
+    url(r'^password/change/$',
+                auth_views.password_change,
+                name='password_change'),
+    url(r'^password/change/done/$',
+                auth_views.password_change_done,
+                name='password_change_done'),
+    url(r'^password/reset/$',
+                auth_views.password_reset,
+                name='password_reset'),
+    url(r'^password/reset/done/$',
+                auth_views.password_reset_done,
+                name='password_reset_done'),
+    url(r'^password/reset/complete/$',
+                auth_views.password_reset_complete,
+                name='password_reset_complete'),
+    url(r'^password/reset/confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
+                auth_views.password_reset_confirm,
+                name='auth_password_reset_confirm'),
+
     url(r'^accounts/', include('registration.backends.default.urls')),
     url(r'^captcha/', include('captcha.urls')),
 )