diff --git a/zproject/urls.py b/zproject/urls.py
index b16c250c4e..d85b9bba39 100644
--- a/zproject/urls.py
+++ b/zproject/urls.py
@@ -33,8 +33,10 @@ urlpatterns = patterns('',
             }),
     url(r'^accounts/password/reset/done/$', 'django.contrib.auth.views.password_reset_done',
         {'template_name': 'zerver/reset_emailed.html'}),
-    url(r'^accounts/password/reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', 'django.contrib.auth.views.password_reset_confirm',
-        {'post_reset_redirect' : '/accounts/password/done/', 'template_name': 'zerver/reset_confirm.html',
+    url(r'^accounts/password/reset/(?P<uidb64>[0-9A-Za-z]+)/(?P<token>.+)/$',
+        'django.contrib.auth.views.password_reset_confirm',
+        {'post_reset_redirect' : '/accounts/password/done/',
+         'template_name': 'zerver/reset_confirm.html',
          'set_password_form' : zerver.forms.LoggingSetPasswordForm}),
     url(r'^accounts/password/done/$', 'django.contrib.auth.views.password_reset_complete',
         {'template_name': 'zerver/reset_done.html'}),