diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 0272e871c..aee01707b 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -24,6 +24,7 @@ Kevin A. Stone
 mozillazg / @mozillazg
 Henrique G. G. Pereira / @ikkebr
 Travis McNeill / gh: Tavistock / @tavistock_esq 
+Matt Linares
 
 * Possesses commit rights
 
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/urls.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/urls.py
index 138cb28c1..d3f24b51f 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/urls.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/urls.py
@@ -18,7 +18,7 @@ urlpatterns = patterns('',
     ),
     # URL pattern for the UserDetailView
     url(
-        regex=r'^(?P<username>[\w\-_]+)/$',
+        regex=r'^(?P<username>[\w.@+-]+)/$',
         view=views.UserDetailView.as_view(),
         name='detail'
     ),