diff --git a/pylons_app/lib/helpers.py b/pylons_app/lib/helpers.py
--- a/pylons_app/lib/helpers.py
+++ b/pylons_app/lib/helpers.py
@@ -277,13 +277,17 @@ def pygmentize_annotation(filenode, **kw
     return literal(annotate_highlight(filenode, url_func, **kwargs))
       
 def repo_name_slug(value):
-    """
-    Return slug of name of repository
+    """Return slug of name of repository
+    This function is called on each creation/modification
+    of repository to prevent bad names in repo
     """
-    slug = urlify(value)
-    for c in """=[]\;'"<>,/~!@#$%^&*()+{}|:""":
+    slug = remove_formatting(value)
+    slug = strip_tags(slug)
+    
+    for c in """=[]\;'"<>,/~!@#$%^&*()+{}|: """:
         slug = slug.replace(c, '-')
     slug = recursive_replace(slug, '-')
+    slug = collapse(slug, '-')
     return slug
 
 def get_changeset_safe(repo, rev):