diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index dd74165f887c4ef98e0ff0304e3f3d936e340fb8..a0d79d7e5c061d76c98e507630cb8ec6b43660df 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -61,8 +61,8 @@ class Namespace < ActiveRecord::Base
     def clean_path(path)
       path.gsub!(/@.*\z/,             "")
       path.gsub!(/\.git\z/,           "")
-      path.gsub!(/\A-/,               "")
-      path.gsub!(/.\z/,               "")
+      path.gsub!(/\A-+/,              "")
+      path.gsub!(/\.+\z/,             "")
       path.gsub!(/[^a-zA-Z0-9_\-\.]/, "")
 
       counter = 0