diff --git a/src/main/twirl/gitbucket/core/account/creategroup.scala.html b/src/main/twirl/gitbucket/core/account/creategroup.scala.html
index 78058bb..2f0d742 100644
--- a/src/main/twirl/gitbucket/core/account/creategroup.scala.html
+++ b/src/main/twirl/gitbucket/core/account/creategroup.scala.html
@@ -3,7 +3,7 @@
   <div class="content-wrapper main-center">
     <div class="content body">
       <h2>Create group</h2>
-      @gitbucket.core.account.html.groupform(None, members)
+      @gitbucket.core.account.html.groupform(None, members, s"${context.path}/groups/new")
     </div>
   </div>
 }
diff --git a/src/main/twirl/gitbucket/core/account/editgroup.scala.html b/src/main/twirl/gitbucket/core/account/editgroup.scala.html
index 0fbf3cf..59fd3c4 100644
--- a/src/main/twirl/gitbucket/core/account/editgroup.scala.html
+++ b/src/main/twirl/gitbucket/core/account/editgroup.scala.html
@@ -1,8 +1,9 @@
 @(account: 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("Edit group"){
   @gitbucket.core.account.html.menu("profile", account.userName, true){
     <h2>Edit group</h2>
-    @gitbucket.core.account.html.groupform(Some(account), members)
+    @gitbucket.core.account.html.groupform(Some(account), members, s"${context.path}/${account.userName}/_editgroup")
   }
 }
diff --git a/src/main/twirl/gitbucket/core/account/groupform.scala.html b/src/main/twirl/gitbucket/core/account/groupform.scala.html
index 95ae9e2..e1e56c8 100644
--- a/src/main/twirl/gitbucket/core/account/groupform.scala.html
+++ b/src/main/twirl/gitbucket/core/account/groupform.scala.html
@@ -1,6 +1,8 @@
-@(account: Option[gitbucket.core.model.Account], members: List[gitbucket.core.model.GroupMember])(implicit context: gitbucket.core.controller.Context)
+@(account: Option[gitbucket.core.model.Account],
+  members: List[gitbucket.core.model.GroupMember],
+  formUrl: String)(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">
+<form id="form" method="post" action="@formUrl" validate="true">
   <div class="row">
     <div class="col-md-5">
       <fieldset class="form-group">
diff --git a/src/main/twirl/gitbucket/core/admin/usergroup.scala.html b/src/main/twirl/gitbucket/core/admin/usergroup.scala.html
index e8b03cf..fb814fa 100644
--- a/src/main/twirl/gitbucket/core/admin/usergroup.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/usergroup.scala.html
@@ -1,134 +1,11 @@
 @(account: Option[gitbucket.core.model.Account], members: List[gitbucket.core.model.GroupMember])(implicit context: gitbucket.core.controller.Context)
 @gitbucket.core.html.main(if(account.isEmpty) "New group" else "Update group"){
   @gitbucket.core.admin.html.menu("users"){
-    <form method="POST" action="@if(account.isEmpty){@context.path/admin/users/_newgroup} else {@context.path/admin/users/@account.get.userName/_editgroup}" validate="true">
-      <div class="row">
-        <div class="col-md-6">
-          <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}/>
-            @if(account.isDefined){
-              <label for="removed">
-                <input type="checkbox" name="removed" id="removed" value="true" @if(account.get.isRemoved){checked}/>
-                Disable
-              </label>
-            }
-          </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 class="strong">Description (Optional)</label>
-            <textarea name="description" id="description" class="form-control">@account.map(_.description)</textarea>
-          </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-6">
-          <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">
-        <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create group} else {Update group}"/>
-        <a href="@context.path/admin/users" class="btn btn-default">Cancel</a>
-      </fieldset>
-    </form>
+    @gitbucket.core.account.html.groupform(account, members,
+      account match {
+        case Some(x) => s"${context.path}/admin/users/${x.userName}/_editgroup"
+        case None    => s"${context.path}/admin/users/_newgroup"
+      }
+    )
   }
 }
-<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);
-  });
-
-  @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>