diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala
index dac5d30..c267954 100644
--- a/src/main/scala/app/WikiController.scala
+++ b/src/main/scala/app/WikiController.scala
@@ -80,16 +80,16 @@
     }
   }
   
-  get("/:owner/:repository/wiki/:page/_edit"){
+  get("/:owner/:repository/wiki/:page/_edit")(usersOnly {
     val owner      = params("owner")
     val repository = params("repository")
     val page       = params("page")
     
     wiki.html.wikiedit(page, 
         getWikiPage(owner, repository, page), getRepository(owner, repository, servletContext).get)
-  }
+  })
   
-  post("/:owner/:repository/wiki/_edit", editForm){ form =>
+  post("/:owner/:repository/wiki/_edit", editForm)(usersOnly { form =>
     val owner      = params("owner")
     val repository = params("repository")
     
@@ -97,16 +97,16 @@
         form.content, context.loginAccount.get, form.message.getOrElse(""))
     
     redirect("%s/%s/wiki/%s".format(owner, repository, form.pageName))
-  }
+  })
   
-  get("/:owner/:repository/wiki/_new"){
+  get("/:owner/:repository/wiki/_new")(usersOnly {
     val owner      = params("owner")
     val repository = params("repository")
     
     wiki.html.wikiedit("", None, getRepository(owner, repository, servletContext).get)
-  }
+  })
   
-  post("/:owner/:repository/wiki/_new", newForm){ form =>
+  post("/:owner/:repository/wiki/_new", newForm)(usersOnly { form =>
     val owner      = params("owner")
     val repository = params("repository")
     
@@ -114,9 +114,9 @@
         form.content, context.loginAccount.get, form.message.getOrElse(""))
     
     redirect("%s/%s/wiki/%s".format(owner, repository, form.pageName))
-  }
+  })
   
-  get("/:owner/:repository/wiki/:page/_delete"){
+  get("/:owner/:repository/wiki/:page/_delete")(usersOnly {
     val owner      = params("owner")
     val repository = params("repository")
     val page       = params("page")
@@ -124,7 +124,7 @@
     deleteWikiPage(owner, repository, page, context.loginAccount.get.userName, "Delete %s".format(page))
     
     redirect("%s/%s/wiki".format(owner, repository))
-  }
+  })
   
   get("/:owner/:repository/wiki/_pages"){
     val owner      = params("owner")
diff --git a/src/main/twirl/wiki/wiki.scala.html b/src/main/twirl/wiki/wiki.scala.html
index bbaa18a..fc95d81 100644
--- a/src/main/twirl/wiki/wiki.scala.html
+++ b/src/main/twirl/wiki/wiki.scala.html
@@ -10,8 +10,10 @@
     </li>
     <li class="pull-right">
       <div class="btn-group">
-        <a class="btn" href="@path/@repository.owner/@repository.name/wiki/_new">New Page</a>
-        <a class="btn" href="@path/@repository.owner/@repository.name/wiki/@pageName/_edit">Edit Page</a>
+        @if(loginAccount.isDefined){
+          <a class="btn" href="@path/@repository.owner/@repository.name/wiki/_new">New Page</a>
+          <a class="btn" href="@path/@repository.owner/@repository.name/wiki/@pageName/_edit">Edit Page</a>
+        }
         <a class="btn" href="@path/@repository.owner/@repository.name/wiki/@pageName/_history">Page History</a>
       </div>
     </li>
diff --git a/src/main/twirl/wiki/wikihistory.scala.html b/src/main/twirl/wiki/wikihistory.scala.html
index aaab27b..1f596d7 100644
--- a/src/main/twirl/wiki/wikihistory.scala.html
+++ b/src/main/twirl/wiki/wikihistory.scala.html
@@ -17,10 +17,14 @@
     <li class="pull-right">
       <div class="btn-group">
         @if(pageName.isEmpty){
-          <a class="btn" href="@path/@repository.owner/@repository.name/wiki/_new">New Page</a>
+          @if(loginAccount.isDefined){
+            <a class="btn" href="@path/@repository.owner/@repository.name/wiki/_new">New Page</a>
+          }
         } else {
           <a class="btn" href="@path/@repository.owner/@repository.name/wiki/@pageName">View Page</a>
-          <a class="btn" href="@path/@repository.owner/@repository.name/wiki/@pageName/_edit">Edit Page</a>
+          @if(loginAccount.isDefined){
+            <a class="btn" href="@path/@repository.owner/@repository.name/wiki/@pageName/_edit">Edit Page</a>
+          }
         }
       </div>
     </li>