diff --git a/app/models/user.rb b/app/models/user.rb
index ba1bcdd..1304b04 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -81,7 +81,7 @@ class User < ActiveRecord::Base
 	end
 
 	def to_param
-		self.login
+		self.login.match(/^[-_a-z0-9]*$/i).nil? ? self.id : self.login
 	end
 
 	protected
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index dab96a0..c4ee2e1 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -48,7 +48,7 @@ class WikiPage < ActiveRecord::Base
 	end
 
 	def to_param
-		self.title['/'].nil? ? self.title : self.id
+		self.title.match(/^[-_a-z0-9]*$/i).nil? ? self.id : self.title
 	end
 
 	def WikiPage.diff(from, to)