diff --git a/colab/accounts/views.py b/colab/accounts/views.py
index 4cc6f15..5188e51 100644
--- a/colab/accounts/views.py
+++ b/colab/accounts/views.py
@@ -279,7 +279,6 @@ def myaccount_redirect(request, route):
     if not request.user.is_authenticated():
         raise Http404()
 
-    username = request.user.username
-    url = "/account/" + username + "/" + route
+    url = '/'.join(('/account', request.user.username, route))
 
     return redirect(url)
diff --git a/colab/urls.py b/colab/urls.py
index e7d048d..78e1958 100644
--- a/colab/urls.py
+++ b/colab/urls.py
@@ -28,8 +28,8 @@ urlpatterns = patterns(
     # (same here) TODO: move to nginx
     url(r'^signup/', include('colab.accounts.urls')),
     url(r'^account/', include('colab.accounts.urls')),
-    url(r'^myaccount/(?P<route>[\w@+.-/?]*)$',
-        'colab.accounts.views.myaccount_redirect',name='myaccount' ),
+    url(r'^myaccount/(?P<route>.*)$',
+        'colab.accounts.views.myaccount_redirect', name='myaccount'),
 
     url(r'', include('django_browserid.urls')),
 
--
libgit2 0.21.2