diff --git a/src/main/scala/gitbucket/core/controller/ControllerBase.scala b/src/main/scala/gitbucket/core/controller/ControllerBase.scala
index 41b45cd..3f04352 100644
--- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala
@@ -321,7 +321,7 @@
         .map    { _ => "Mail address is already registered." }
   }
 
-  val allReservedNames = Set("git", "admin", "upload", "api")
+  val allReservedNames = Set("git", "admin", "upload", "api", "assets", "plugin-assets")
   protected def reservedNames(): Constraint = new Constraint(){
     override def validate(name: String, value: String, messages: Messages): Option[String] = if(allReservedNames.contains(value)){
       Some(s"${value} is reserved")