diff --git a/src/main/scala/service/RepositoryService.scala b/src/main/scala/service/RepositoryService.scala
index 74bd139..76e09a9 100644
--- a/src/main/scala/service/RepositoryService.scala
+++ b/src/main/scala/service/RepositoryService.scala
@@ -147,7 +147,8 @@
         getForkedCount(
           repository.originUserName.getOrElse(repository.userName),
           repository.originRepositoryName.getOrElse(repository.repositoryName)
-        ))
+        ),
+        getRepositoryManagers(repository.userName))
     }
   }
 
@@ -162,7 +163,8 @@
         getForkedCount(
           repository.originUserName.getOrElse(repository.userName),
           repository.originRepositoryName.getOrElse(repository.repositoryName)
-        ))
+        ),
+        getRepositoryManagers(repository.userName))
     }
   }
 
@@ -195,10 +197,18 @@
         getForkedCount(
           repository.originUserName.getOrElse(repository.userName),
           repository.originRepositoryName.getOrElse(repository.repositoryName)
-        ))
+        ),
+        getRepositoryManagers(repository.userName))
     }
   }
 
+  private def getRepositoryManagers(userName: String): Seq[String] =
+    if(getAccountByUserName(userName).exists(_.isGroupAccount)){
+      getGroupMembers(userName).filter(_._2).map(_._1)
+    } else {
+      Seq(userName)
+    }
+
   /**
    * Updates the last activity date of the repository.
    */
@@ -280,19 +290,19 @@
 
   case class RepositoryInfo(owner: String, name: String, url: String, repository: Repository,
     issueCount: Int, pullCount: Int, commitCount: Int, forkedCount: Int,
-    branchList: List[String], tags: List[util.JGitUtil.TagInfo]){
+    branchList: Seq[String], tags: Seq[util.JGitUtil.TagInfo], managers: Seq[String]){
 
     /**
      * Creates instance with issue count and pull request count.
      */
-    def this(repo: JGitUtil.RepositoryInfo, model: Repository, issueCount: Int, pullCount: Int, forkedCount: Int) =
-      this(repo.owner, repo.name, repo.url, model, issueCount, pullCount, repo.commitCount, forkedCount, repo.branchList, repo.tags)
+    def this(repo: JGitUtil.RepositoryInfo, model: Repository, issueCount: Int, pullCount: Int, forkedCount: Int, managers: Seq[String]) =
+      this(repo.owner, repo.name, repo.url, model, issueCount, pullCount, repo.commitCount, forkedCount, repo.branchList, repo.tags, managers)
 
     /**
      * Creates instance without issue count and pull request count.
      */
-    def this(repo: JGitUtil.RepositoryInfo, model: Repository, forkedCount: Int) =
-      this(repo.owner, repo.name, repo.url, model, 0, 0, repo.commitCount, forkedCount, repo.branchList, repo.tags)
+    def this(repo: JGitUtil.RepositoryInfo, model: Repository, forkedCount: Int, managers: Seq[String]) =
+      this(repo.owner, repo.name, repo.url, model, 0, 0, repo.commitCount, forkedCount, repo.branchList, repo.tags, managers)
   }
 
   case class RepositoryTreeNode(owner: String, name: String, children: List[RepositoryTreeNode])
diff --git a/src/main/scala/util/Authenticator.scala b/src/main/scala/util/Authenticator.scala
index bfa2a40..0c56abf 100644
--- a/src/main/scala/util/Authenticator.scala
+++ b/src/main/scala/util/Authenticator.scala
@@ -29,7 +29,7 @@
 /**
  * Allows only the repository owner and administrators.
  */
-trait OwnerAuthenticator { self: ControllerBase with RepositoryService =>
+trait OwnerAuthenticator { self: ControllerBase with RepositoryService with AccountService =>
   protected def ownerOnly(action: (RepositoryInfo) => Any) = { authenticate(action) }
   protected def ownerOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) }
 
@@ -40,6 +40,9 @@
           context.loginAccount match {
             case Some(x) if(x.isAdmin) => action(repository)
             case Some(x) if(repository.owner == x.userName) => action(repository)
+            case Some(x) if(getGroupMembers(repository.owner).exists {
+              case (userName, isManager) => userName == x.userName && isManager == true
+            }) => action(repository)
             case _ => Unauthorized()
           }
         } getOrElse NotFound()
@@ -106,7 +109,7 @@
 }
 
 /**
- * Allows only the repository owner and administrators.
+ * Allows only the repository owner (or manager for group repository) and administrators.
  */
 trait ReferrerAuthenticator { self: ControllerBase with RepositoryService =>
   protected def referrersOnly(action: (RepositoryInfo) => Any) = { authenticate(action) }
diff --git a/src/main/twirl/header.scala.html b/src/main/twirl/header.scala.html
index 55f19ee..d7591ba 100644
--- a/src/main/twirl/header.scala.html
+++ b/src/main/twirl/header.scala.html
@@ -56,7 +56,7 @@
     <th class="box-header@if(active=="network"){ active}">
       <a href="@url(repository)/network/members">Network</a>
     </th>
-    @if(loginAccount.isDefined && (loginAccount.get.isAdmin || loginAccount.get.userName == repository.owner)){
+    @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){
     <th class="box-header@if(active=="settings"){ active}">
       <a href="@url(repository)/settings">Settings</a>
     </th>
diff --git a/src/main/twirl/repo/branches.scala.html b/src/main/twirl/repo/branches.scala.html
index 219c7c1..bc26459 100644
--- a/src/main/twirl/repo/branches.scala.html
+++ b/src/main/twirl/repo/branches.scala.html
@@ -1,4 +1,4 @@
-@(branchInfo: List[(String, java.util.Date)],
+@(branchInfo: Seq[(String, java.util.Date)],
   hasWritePermission: Boolean,
   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
diff --git a/src/main/twirl/settings/collaborators.scala.html b/src/main/twirl/settings/collaborators.scala.html
index 8264764..cf894a4 100644
--- a/src/main/twirl/settings/collaborators.scala.html
+++ b/src/main/twirl/settings/collaborators.scala.html
@@ -13,6 +13,10 @@
           <a href="@url(collaboratorName)">@collaboratorName</a>
           @if(!isGroupRepository){
             <a href="@url(repository)/settings/collaborators/remove?name=@collaboratorName" class="remove">(remove)</a>
+          } else {
+            @if(repository.managers.contains(collaboratorName)){
+              (Manager)
+            }
           }
         </li>
       }