diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala
index 1ac1a0d..022acdd 100644
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -13,7 +13,6 @@
 import gitbucket.core.util.StringUtil._
 import gitbucket.core.util._
 import io.github.gitbucket.scalatra.forms._
-import org.apache.commons.io.FileUtils
 import org.scalatra.i18n.Messages
 import org.scalatra.BadRequest
 
@@ -440,7 +439,7 @@
   }
 
   get("/groups/new")(usersOnly {
-    html.group(None, List(GroupMember("", context.loginAccount.get.userName, true)))
+    html.creategroup(List(GroupMember("", context.loginAccount.get.userName, true)))
   })
 
   post("/groups/new", newGroupForm)(usersOnly { form =>
@@ -456,7 +455,8 @@
 
   get("/:groupName/_editgroup")(managersOnly {
     defining(params("groupName")){ groupName =>
-      html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName))
+      // TODO Don't use Option.get
+      html.editgroup(getAccountByUserName(groupName, true).get, getGroupMembers(groupName))
     }
   })
 
diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html
index 0bd5f99..62ab06b 100644
--- a/src/main/twirl/gitbucket/core/account/application.scala.html
+++ b/src/main/twirl/gitbucket/core/account/application.scala.html
@@ -2,7 +2,7 @@
   personalTokens: List[gitbucket.core.model.AccessToken],
   gneratedToken: Option[(gitbucket.core.model.AccessToken, String)])(implicit context: gitbucket.core.controller.Context)
 @gitbucket.core.html.main("Applications"){
-  @gitbucket.core.account.html.menu("application", context.settings.ssh){
+  @gitbucket.core.account.html.menu("application", context.loginAccount.get.userName, false){
     <div class="panel panel-default">
       <div class="panel-heading strong">Personal access tokens</div>
       <div class="panel-body">
diff --git a/src/main/twirl/gitbucket/core/account/creategroup.scala.html b/src/main/twirl/gitbucket/core/account/creategroup.scala.html
new file mode 100644
index 0000000..78058bb
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/account/creategroup.scala.html
@@ -0,0 +1,9 @@
+@(members: List[gitbucket.core.model.GroupMember])(implicit context: gitbucket.core.controller.Context)
+@gitbucket.core.html.main("Create group"){
+  <div class="content-wrapper main-center">
+    <div class="content body">
+      <h2>Create group</h2>
+      @gitbucket.core.account.html.groupform(None, members)
+    </div>
+  </div>
+}
diff --git a/src/main/twirl/gitbucket/core/account/edit.scala.html b/src/main/twirl/gitbucket/core/account/edit.scala.html
index 9237745..76e429e 100644
--- a/src/main/twirl/gitbucket/core/account/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/account/edit.scala.html
@@ -2,7 +2,7 @@
 @import gitbucket.core.util.LDAPUtil
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main("Edit your profile"){
-  @gitbucket.core.account.html.menu("profile", context.settings.ssh){
+  @gitbucket.core.account.html.menu("profile", context.loginAccount.get.userName, false){
     @gitbucket.core.helper.html.information(info)
     @gitbucket.core.helper.html.error(error)
     @if(LDAPUtil.isDummyMailAddress(account)){<div class="alert alert-danger">Please register your mail address.</div>}
diff --git a/src/main/twirl/gitbucket/core/account/editgroup.scala.html b/src/main/twirl/gitbucket/core/account/editgroup.scala.html
new file mode 100644
index 0000000..0fbf3cf
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/account/editgroup.scala.html
@@ -0,0 +1,8 @@
+@(account: gitbucket.core.model.Account,
+  members: List[gitbucket.core.model.GroupMember])(implicit context: gitbucket.core.controller.Context)
+@gitbucket.core.html.main("Edit group"){
+  @gitbucket.core.account.html.menu("profile", account.userName, true){
+    <h2>Edit group</h2>
+    @gitbucket.core.account.html.groupform(Some(account), members)
+  }
+}
diff --git a/src/main/twirl/gitbucket/core/account/edithook.scala.html b/src/main/twirl/gitbucket/core/account/edithook.scala.html
index 2b44ef1..8a7931a 100644
--- a/src/main/twirl/gitbucket/core/account/edithook.scala.html
+++ b/src/main/twirl/gitbucket/core/account/edithook.scala.html
@@ -4,7 +4,7 @@
   create: Boolean)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main("Service Hooks"){
-  @gitbucket.core.account.html.menu("hooks", context.settings.ssh){
+  @gitbucket.core.account.html.menu("hooks", account.userName, account.isGroupAccount){
     @gitbucket.core.settings.html.edithookform(
       webHook, events, create,
       helpers.url(account.userName) + "/_hooks/new",
diff --git a/src/main/twirl/gitbucket/core/account/group.scala.html b/src/main/twirl/gitbucket/core/account/group.scala.html
deleted file mode 100644
index 725581f..0000000
--- a/src/main/twirl/gitbucket/core/account/group.scala.html
+++ /dev/null
@@ -1,145 +0,0 @@
-@(account: Option[gitbucket.core.model.Account], members: List[gitbucket.core.model.GroupMember])(implicit context: gitbucket.core.controller.Context)
-@import gitbucket.core.view.helpers
-@gitbucket.core.html.main(if(account.isEmpty) "Create group" else "Edit group"){
-<div class="content-wrapper main-center">
-  <div class="content body">
-    <h2>@{if(account.isEmpty) "Create group" else "Edit group"}</h2>
-    <form id="form" method="post" action="@if(account.isEmpty){@context.path/groups/new} else {@context.path/@account.get.userName/_editgroup}" validate="true">
-      <div class="row">
-        <div class="col-md-5">
-          <fieldset class="form-group">
-            <label for="groupName" class="strong">Group name</label>
-            <div>
-              <span id="error-groupName" class="error"></span>
-            </div>
-            <input type="text" name="groupName" id="groupName" class="form-control" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
-          </fieldset>
-          <fieldset class="form-group">
-            <label class="strong">URL (Optional)</label>
-            <div>
-              <span id="error-url" class="error"></span>
-            </div>
-            <input type="text" name="url" id="url" class="form-control" value="@account.map(_.url)"/>
-          </fieldset>
-          <fieldset class="form-group">
-            <label for="groupDescription" class="strong">Description (Optional)</label>
-            <div>
-              <textarea name="description" id="description" class="form-control">@account.map(_.description)</textarea>
-            </div>
-          </fieldset>
-          <fieldset class="form-group">
-            <label for="avatar" class="strong">Image (Optional)</label>
-            @gitbucket.core.helper.html.uploadavatar(account)
-          </fieldset>
-        </div>
-        <div class="col-md-7">
-          <fieldset class="form-group">
-            <label class="strong">Members</label>
-            <ul id="member-list" class="collaborator">
-            </ul>
-            @gitbucket.core.helper.html.account("memberName", 200, true, false)
-            <input type="button" class="btn btn-default" value="Add" id="addMember"/>
-            <input type="hidden" id="members" name="members" value="@members.map(member => member.userName + ":" + member.isManager).mkString(",")"/>
-            <div>
-              <span class="error" id="error-members"></span>
-            </div>
-          </fieldset>
-        </div>
-      </div>
-      <fieldset class="border-top">
-        @if(account.isDefined){
-          <div class="pull-right">
-            <a href="@helpers.url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete group</a>
-          </div>
-        }
-        <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create group} else {Update group}"/>
-        @if(account.isDefined){
-          <a href="@helpers.url(account.get.userName)" class="btn btn-default">Cancel</a>
-        }
-      </fieldset>
-    </form>
-  </div>
-</div>
-}
-<script>
-$(function(){
-  $('input[type=submit]').click(function(){
-    updateMembers();
-  });
-
-  $('#addMember').click(function(){
-    $('#error-members').text('');
-    var userName = $('#memberName').val();
-
-    // check empty
-    if($.trim(userName) == ''){
-      return false;
-    }
-
-    // check duplication
-    var exists = $('#member-list li').filter(function(){
-      return $(this).data('name') == userName;
-    }).length > 0;
-    if(exists){
-      $('#error-members').text('User has been already added.');
-      return false;
-    }
-
-    // check existence
-    $.post('@context.path/_user/existence', { 'userName': userName },
-      function(data, status){
-        if(data == 'user'){
-          addMemberHTML(userName, false);
-        } else {
-          $('#error-members').text('User does not exist.');
-        }
-      });
-  });
-
-  $(document).on('click', '.remove', function(){
-    $(this).parent().remove();
-  });
-
-  // Don't submit form by ENTER key
-  $('#memberName').keypress(function(e){
-    return !(e.keyCode == 13);
-  });
-
-  $('#delete').click(function(){
-    return confirm('Once you delete this group, there is no going back.\nAre you sure?');
-  });
-
-  @members.map { member =>
-    addMemberHTML('@member.userName', @member.isManager);
-  }
-
-  function addMemberHTML(userName, isManager){
-    var memberButton = $('<label class="btn btn-default btn-mini"><input type="radio" value="false" name="' + userName + '">Member</label>');
-    if(!isManager){
-      memberButton.addClass('active');
-    }
-    var managerButton = $('<label class="btn btn-default btn-mini"><input type="radio" value="true" name="' + userName + '">Manager</label>');
-    if(isManager){
-      managerButton.addClass('active');
-    }
-
-    $('#member-list').append($('<li>')
-      .data('name', userName)
-      .append($('<div class="btn-group is_manager" data-toggle="buttons">')
-        .append(memberButton)
-        .append(managerButton))
-      .append(' ')
-      .append($('<a>').attr('href', '@context.path/' + userName).text(userName))
-      .append(' ')
-      .append($('<a href="#" class="remove pull-right">(remove)</a>')));
-  }
-
-  function updateMembers(){
-    var members = $('#member-list li').map(function(i, e){
-      var userName = $(e).data('name');
-      return userName + ':' + $(e).find('label.active input[type=radio]').attr('value');
-    }).get().join(',');
-    $('#members').val(members);
-  }
-});
-</script>
diff --git a/src/main/twirl/gitbucket/core/account/groupform.scala.html b/src/main/twirl/gitbucket/core/account/groupform.scala.html
new file mode 100644
index 0000000..95ae9e2
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/account/groupform.scala.html
@@ -0,0 +1,138 @@
+@(account: Option[gitbucket.core.model.Account], members: List[gitbucket.core.model.GroupMember])(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+<form id="form" method="post" action="@if(account.isEmpty){@context.path/groups/new} else {@context.path/@account.get.userName/_editgroup}" validate="true">
+  <div class="row">
+    <div class="col-md-5">
+      <fieldset class="form-group">
+        <label for="groupName" class="strong">Group name</label>
+        <div>
+          <span id="error-groupName" class="error"></span>
+        </div>
+        <input type="text" name="groupName" id="groupName" class="form-control" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
+      </fieldset>
+      <fieldset class="form-group">
+        <label class="strong">URL (Optional)</label>
+        <div>
+          <span id="error-url" class="error"></span>
+        </div>
+        <input type="text" name="url" id="url" class="form-control" value="@account.map(_.url)"/>
+      </fieldset>
+      <fieldset class="form-group">
+        <label for="groupDescription" class="strong">Description (Optional)</label>
+        <div>
+          <textarea name="description" id="description" class="form-control">@account.map(_.description)</textarea>
+        </div>
+      </fieldset>
+      <fieldset class="form-group">
+        <label for="avatar" class="strong">Image (Optional)</label>
+        @gitbucket.core.helper.html.uploadavatar(account)
+      </fieldset>
+    </div>
+    <div class="col-md-7">
+      <fieldset class="form-group">
+        <label class="strong">Members</label>
+        <ul id="member-list" class="collaborator">
+        </ul>
+        @gitbucket.core.helper.html.account("memberName", 200, true, false)
+        <input type="button" class="btn btn-default" value="Add" id="addMember"/>
+        <input type="hidden" id="members" name="members" value="@members.map(member => member.userName + ":" + member.isManager).mkString(",")"/>
+        <div>
+          <span class="error" id="error-members"></span>
+        </div>
+      </fieldset>
+    </div>
+  </div>
+  <fieldset class="border-top">
+    @if(account.isDefined){
+      <div class="pull-right">
+        <a href="@helpers.url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete group</a>
+      </div>
+    }
+    <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create group} else {Update group}"/>
+    @if(account.isDefined){
+      <a href="@helpers.url(account.get.userName)" class="btn btn-default">Cancel</a>
+    }
+  </fieldset>
+</form>
+<script>
+$(function(){
+  $('input[type=submit]').click(function(){
+    updateMembers();
+  });
+
+  $('#addMember').click(function(){
+    $('#error-members').text('');
+    var userName = $('#memberName').val();
+
+    // check empty
+    if($.trim(userName) == ''){
+      return false;
+    }
+
+    // check duplication
+    var exists = $('#member-list li').filter(function(){
+      return $(this).data('name') == userName;
+    }).length > 0;
+    if(exists){
+      $('#error-members').text('User has been already added.');
+      return false;
+    }
+
+    // check existence
+    $.post('@context.path/_user/existence', { 'userName': userName },
+      function(data, status){
+        if(data == 'user'){
+          addMemberHTML(userName, false);
+        } else {
+          $('#error-members').text('User does not exist.');
+        }
+      });
+  });
+
+  $(document).on('click', '.remove', function(){
+    $(this).parent().remove();
+  });
+
+  // Don't submit form by ENTER key
+  $('#memberName').keypress(function(e){
+    return !(e.keyCode == 13);
+  });
+
+  $('#delete').click(function(){
+    return confirm('Once you delete this group, there is no going back.\nAre you sure?');
+  });
+
+  @members.map { member =>
+    addMemberHTML('@member.userName', @member.isManager);
+  }
+
+  function addMemberHTML(userName, isManager){
+    var memberButton = $('<label class="btn btn-default btn-mini"><input type="radio" value="false" name="' + userName + '">Member</label>');
+    if(!isManager){
+      memberButton.addClass('active');
+    }
+    var managerButton = $('<label class="btn btn-default btn-mini"><input type="radio" value="true" name="' + userName + '">Manager</label>');
+    if(isManager){
+      managerButton.addClass('active');
+    }
+
+    $('#member-list').append($('<li>')
+      .data('name', userName)
+      .append($('<div class="btn-group is_manager" data-toggle="buttons">')
+        .append(memberButton)
+        .append(managerButton))
+      .append(' ')
+      .append($('<a>').attr('href', '@context.path/' + userName).text(userName))
+      .append(' ')
+      .append($('<a href="#" class="remove pull-right">(remove)</a>')));
+  }
+
+  function updateMembers(){
+    var members = $('#member-list li').map(function(i, e){
+      var userName = $(e).data('name');
+      return userName + ':' + $(e).find('label.active input[type=radio]').attr('value');
+    }).get().join(',');
+    $('#members').val(members);
+  }
+});
+</script>
diff --git a/src/main/twirl/gitbucket/core/account/hooks.scala.html b/src/main/twirl/gitbucket/core/account/hooks.scala.html
index 34bfdc4..1351c68 100644
--- a/src/main/twirl/gitbucket/core/account/hooks.scala.html
+++ b/src/main/twirl/gitbucket/core/account/hooks.scala.html
@@ -3,7 +3,7 @@
   info: Option[Any])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main("Service Hooks"){
-  @gitbucket.core.account.html.menu("hooks", context.settings.ssh){
+  @gitbucket.core.account.html.menu("hooks", account.userName, account.isGroupAccount){
     @gitbucket.core.helper.html.information(info)
     <div class="panel panel-default">
       <div class="panel-heading strong">
diff --git a/src/main/twirl/gitbucket/core/account/menu.scala.html b/src/main/twirl/gitbucket/core/account/menu.scala.html
index 4a4edcf..16e0341 100644
--- a/src/main/twirl/gitbucket/core/account/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/account/menu.scala.html
@@ -1,42 +1,50 @@
-@(active: String, ssh: Boolean)(body: Html)(implicit context: gitbucket.core.controller.Context)
+@(active: String, userName: String, group: Boolean)(body: Html)(implicit context: gitbucket.core.controller.Context)
 <div class="main-sidebar">
   <div class="sidebar">
     <ul class="sidebar-menu">
-      <li class="menu-item-hover @if(active=="profile"){active}">
-        <a href="@context.path/@context.loginAccount.get.userName/_edit">
-          <i class="menu-icon octicon octicon-person"></i>
-          <span>Profile</span>
-        </a>
-      </li>
-      @if(ssh){
-      <li class="menu-item-hover @if(active=="ssh"){active}">
-        <a href="@context.path/@context.loginAccount.get.userName/_ssh">
-          <i class="menu-icon octicon octicon-key"></i>
-          <span>SSH Keys</span>
-        </a>
-      </li>
-      }
-      <li class="menu-item-hover @if(active=="application"){active}">
-        <a href="@context.path/@context.loginAccount.get.userName/_application">
-          <i class="menu-icon octicon octicon-rocket"></i>
-          <span>Applications</span>
-        </a>
-      </li>
-      <li class="menu-item-hover @if(active=="hooks"){active}">
-        <a href="@context.path/@context.loginAccount.get.userName/_hooks">
-          <i class="menu-icon octicon octicon-zap"></i>
-          <span>Service Hooks</span>
-        </a>
-      </li>
-      @gitbucket.core.plugin.PluginRegistry().getAccountSettingMenus.map { menu =>
-        @menu(context).map { link =>
-          <li class="menu-item-hover @if(active==link.id){active}">
-            <a href="@context.path/@link.path">
-              <i class="menu-icon octicon octicon-plug"></i>
-              <span>@link.label</span>
+      @if(group){
+        <li class="menu-item-hover @if(active=="profile"){active}">
+          <a href="@context.path/@userName/_editgroup">
+            <i class="menu-icon octicon octicon-person"></i> <span>Profile</span>
+          </a>
+        </li>
+        <li class="menu-item-hover @if(active=="hooks"){active}">
+          <a href="@context.path/@userName/_hooks">
+            <i class="menu-icon octicon octicon-zap"></i> <span>Service Hooks</span>
+          </a>
+        </li>
+      } else {
+        <li class="menu-item-hover @if(active=="profile"){active}">
+          <a href="@context.path/@userName/_edit">
+            <i class="menu-icon octicon octicon-person"></i> <span>Profile</span>
+          </a>
+        </li>
+        @if(context.settings.ssh){
+          <li class="menu-item-hover @if(active=="ssh"){active}">
+            <a href="@context.path/@userName/_ssh">
+              <i class="menu-icon octicon octicon-key"></i> <span>SSH Keys</span>
             </a>
           </li>
         }
+        <li class="menu-item-hover @if(active=="application"){active}">
+          <a href="@context.path/@userName/_application">
+            <i class="menu-icon octicon octicon-rocket"></i> <span>Applications</span>
+          </a>
+        </li>
+        <li class="menu-item-hover @if(active=="hooks"){active}">
+          <a href="@context.path/@userName/_hooks">
+            <i class="menu-icon octicon octicon-zap"></i> <span>Service Hooks</span>
+          </a>
+        </li>
+        @gitbucket.core.plugin.PluginRegistry().getAccountSettingMenus.map { menu =>
+          @menu(context).map { link =>
+            <li class="menu-item-hover @if(active==link.id){active}">
+              <a href="@context.path/@link.path">
+                <i class="menu-icon octicon octicon-plug"></i> <span>@link.label</span>
+              </a>
+            </li>
+          }
+        }
       }
     </ul>
   </div>
diff --git a/src/main/twirl/gitbucket/core/account/ssh.scala.html b/src/main/twirl/gitbucket/core/account/ssh.scala.html
index 344a70a..aece9ba 100644
--- a/src/main/twirl/gitbucket/core/account/ssh.scala.html
+++ b/src/main/twirl/gitbucket/core/account/ssh.scala.html
@@ -1,7 +1,7 @@
 @(account: gitbucket.core.model.Account, sshKeys: List[gitbucket.core.model.SshKey])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.ssh.SshUtil
 @gitbucket.core.html.main("SSH Keys"){
-  @gitbucket.core.account.html.menu("ssh", context.settings.ssh){
+  @gitbucket.core.account.html.menu("ssh", context.loginAccount.get.userName, false){
     <div class="panel panel-default">
       <div class="panel-heading strong">SSH Keys</div>
       <div class="panel-body">