diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
index b818d252c..5b7b41dce 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
@@ -1724,7 +1724,9 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
      }
     });
 
-    this.newLdapGroupMapping=ko.observable(new LdapGroupMapping("",[],false,self.modifyLdapGroupMapping));
+    this.newLdapGroupMapping=ko.observable(new LdapGroupMapping("",[],false,null));
+
+    this.ldapSelectOptionCaption = $.i18n.prop('redback.runtime.ldap.mapping.select.group');
 
     addLdapGroupMapping=function(){
       // FIXME validate datas from ldapGroupMapping
@@ -1740,12 +1742,11 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
              {
                type: "PUT",
                contentType: 'application/json',
-               data:ko.toJSON(new LdapGroupMapping(self.newLdapGroupMapping().group(),self.newLdapGroupMapping().roleNames(),false,self.modifyLdapGroupMapping)),
+               data:ko.toJSON(new LdapGroupMapping(self.newLdapGroupMapping().group(),self.newLdapGroupMapping().roleNames(),false,null)),
                dataType: 'json',
                success: function(data) {
                  self.redbackRuntimeConfiguration().ldapGroupMappings
                          .unshift(new LdapGroupMapping(self.newLdapGroupMapping().group(),self.newLdapGroupMapping().roleNames(),false,self.modifyLdapGroupMapping));
-                 self.newLdapGroupMapping=ko.observable(new LdapGroupMapping("",[],false,self.modifyLdapGroupMapping));
                  $.log("addLdapGroupMapping:"+self.redbackRuntimeConfiguration().ldapGroupMappings().length);
                  $("#ldap-group-mappings-div select" ).select2({width: "element"});
                  var message=$.i18n.prop('redback-runtime-ldap-group-mapping.added');
@@ -1759,6 +1760,10 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
       ).always(
         function(){
           removeMediumSpinnerImg(userMessages);
+          $.log("addLdapGroupMapping#always");
+          //self.newLdapGroupMapping().group("");
+          //self.newLdapGroupMapping().roleNames([]);
+          self.newLdapGroupMapping=ko.observable(new LdapGroupMapping("",[],false,null));
           saveButton.button('reset');
         }
       );
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
index 465bc7aea..8ec100d5b 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
@@ -1247,30 +1247,6 @@
 
 </script>
 
-<script id="redback-runtime-ldap-mapping-grid" type="text/html">
-  <thead>
-    <tr>
-      <th>${$.i18n.prop('redback.runtime.ldap.mapping.group.label')}</th>
-      <th>${$.i18n.prop('redback.runtime.ldap.mapping.roles.label')}</th>
-    </tr>
-    </thead>
-    <tbody id="ldap-group-mappings-tbody">
-
-    {{each(i, ldapGroupMapping) itemsOnCurrentPage()}}
-      <tr>
-        <td>${ldapGroupMapping.group()}
-          <select id="roles-group-${ldapGroupMapping.group()}" data-bind="options: ldapGroups, value: ldapGroupMapping.group, optionsCaption: 'Select a LDAP Group'"
-                  size="1"></select>
-        </td>
-        <td>
-          <select id="roles-group-mapping-${ldapGroupMapping.group()}" data-bind="options: $parent.allRoleNames, selectedOptions: ldapGroupMapping.roleNames"
-                  size="5" multiple="true" ></select>
-        </td>
-      </tr>
-    {{/each}}
-  </tbody>
-</script>
-
 <script id="redback-runtime-ldap-mapping-tmpl" type="text/html">
   <div class="well" id="ldap-group-mappings-div">
   <table class="table table-condensed">
@@ -1289,7 +1265,7 @@
           </span>
         </td>
         <td>
-          <select data-bind="options: ldapGroups, optionsCaption: 'Select a LDAP Group',value: $parent.newLdapGroupMapping().group" size="1">
+          <select data-bind="options: ldapGroups,value: $parent.newLdapGroupMapping().group" size="1">
           </select>
         </td>
         <td>
@@ -1319,6 +1295,34 @@
   </div>
 </script>
 
+
+<!-- doesn't with simple grid knockout binding -->
+<!--
+<script id="redback-runtime-ldap-mapping-grid" type="text/html">
+  <thead>
+  <tr>
+    <th>${$.i18n.prop('redback.runtime.ldap.mapping.group.label')}</th>
+    <th>${$.i18n.prop('redback.runtime.ldap.mapping.roles.label')}</th>
+  </tr>
+  </thead>
+  <tbody id="ldap-group-mappings-tbody">
+
+  {{each(i, ldapGroupMapping) itemsOnCurrentPage()}}
+  <tr>
+    <td>${ldapGroupMapping.group()}
+      <select id="roles-group-${ldapGroupMapping.group()}" data-bind="options: ldapGroups, value: ldapGroupMapping.group, optionsCaption: 'Select a LDAP Group'"
+              size="1"></select>
+    </td>
+    <td>
+      <select id="roles-group-mapping-${ldapGroupMapping.group()}" data-bind="options: $parent.allRoleNames, selectedOptions: ldapGroupMapping.roleNames"
+              size="5" multiple="true" ></select>
+    </td>
+  </tr>
+  {{/each}}
+  </tbody>
+</script>
+-->
+
 <script id="redback-runtime-general-content-impl-informations" type="text/html">
   <div class="well draggable-item">
     ${$data.description}