diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java
index 537d86faf..7f1ac5ca4 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java
@@ -43,7 +43,7 @@ import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.util.LaRequestUtil;
 
 /**
- * @author codelibs
+ * @author shinsuke
  * @author Keiichi Watanabe
  */
 public class AdminDataconfigAction extends FessAdminAction {
@@ -137,7 +137,6 @@ public class AdminDataconfigAction extends FessAdminAction {
     }
 
     @Execute
-    //(token = TxToken.SAVE)
     public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, () -> asListHtml());
         final String id = form.id;
@@ -146,13 +145,20 @@ public class AdminDataconfigAction extends FessAdminAction {
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asListHtml());
         });
+        saveToken();
         if (form.crudMode.intValue() == CrudMode.EDIT) {
             // back
             form.crudMode = CrudMode.DETAILS;
-            return asDetailsHtml();
+            return asDetailsHtml().renderWith(data -> {
+                registerRolesAndLabels(data);
+                registerHandlerNames(data);
+            });
         } else {
             form.crudMode = CrudMode.EDIT;
-            return asEditHtml();
+            return asEditHtml().renderWith(data -> {
+                registerRolesAndLabels(data);
+                registerHandlerNames(data);
+            });
         }
     }
 
diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp
index 471275689..6e8709c46 100644
--- a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp
@@ -52,8 +52,8 @@
 											<table class="table table-bordered table-striped">
 												<thead>
 													<tr>
-														<th><la:message key="labels.name" /></th>
-														<th><la:message key="labels.available" /></th>
+														<th class="col-md-8"><la:message key="labels.name" /></th>
+														<th class="col-md-4 text-center"><la:message key="labels.available" /></th>
 													</tr>
 												</thead>
 												<tbody>