diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.repository.js b/scm-webapp/src/main/webapp/resources/js/sonia.repository.js
index 0802b4e71a..499ae1a7da 100644
--- a/scm-webapp/src/main/webapp/resources/js/sonia.repository.js
+++ b/scm-webapp/src/main/webapp/resources/js/sonia.repository.js
@@ -394,16 +394,11 @@ Sonia.repository.FormPanel = Ext.extend(Sonia.rest.FormPanel,{
     });
   },
 
-  reset: function(){
+  cancel: function(){
     if ( debug ){
-      console.debug( 'reset form' );
-    }
-    this.getForm().reset();
-    if ( this.item != null ){
-      this.permissionStore.loadData( this.item );
-    } else {
-      this.permissionStore.removeAll();
+      console.debug( 'cancel form' );
     }
+    Sonia.repository.setEditPanel( Sonia.repository.DefaultPanel );
   }
 
 });
diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.rest.js b/scm-webapp/src/main/webapp/resources/js/sonia.rest.js
index c640fb6fc5..cc0b73e431 100644
--- a/scm-webapp/src/main/webapp/resources/js/sonia.rest.js
+++ b/scm-webapp/src/main/webapp/resources/js/sonia.rest.js
@@ -152,7 +152,7 @@ Sonia.rest.FormPanel = Ext.extend(Ext.FormPanel,{
       buttonAlign: 'center',
       buttons: [
         {text: 'Ok', formBind: true, scope: this, handler: this.submit},
-        {text: 'Cancel', scope: this, handler: this.reset}
+        {text: 'Cancel', scope: this, handler: this.cancel}
       ]
     }
 
@@ -182,7 +182,7 @@ Sonia.rest.FormPanel = Ext.extend(Ext.FormPanel,{
     }
   },
   
-  reset: function(){
+  cancel: function(){
     if ( debug ){
       console.debug( 'reset form' );
     }
diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.user.js b/scm-webapp/src/main/webapp/resources/js/sonia.user.js
index 945f210d36..106edd9e33 100644
--- a/scm-webapp/src/main/webapp/resources/js/sonia.user.js
+++ b/scm-webapp/src/main/webapp/resources/js/sonia.user.js
@@ -32,6 +32,26 @@
 // register namespace
 Ext.ns('Sonia.user');
 
+
+// functions
+
+Sonia.user.setEditPanel = function(panel){
+  var editPanel = Ext.getCmp('userEditPanel');
+  editPanel.removeAll();
+  editPanel.add(panel);
+  editPanel.doLayout();
+}
+
+// Panels
+
+Sonia.user.DefaultPanel = {
+  region: 'south',
+  title: 'User Form',
+  padding: 5,
+  xtype: 'panel',
+  html: 'Add or select an User'
+};
+
 // UserGrid
 Sonia.user.Grid = Ext.extend(Sonia.rest.Grid, {
 
@@ -74,8 +94,6 @@ Sonia.user.Grid = Ext.extend(Sonia.rest.Grid, {
     if ( debug ){
       console.debug( item.name + ' selected' );
     }
-    var editPanel = Ext.getCmp('userEditPanel');
-    editPanel.removeAll();
     var panel = new Sonia.user.FormPanel({
       item: item,
       region: 'south',
@@ -94,8 +112,7 @@ Sonia.user.Grid = Ext.extend(Sonia.rest.Grid, {
       {id: 'password', value: dummyPassword},
       {id: 'password-confirm', value: dummyPassword}
     ]);
-    editPanel.add(panel);
-    editPanel.doLayout();
+    Sonia.user.setEditPanel(panel);
   }
 
 });
@@ -211,6 +228,10 @@ Sonia.user.FormPanel = Ext.extend(Sonia.rest.FormPanel,{
         alert( 'failure' );
       }
     });
+  },
+
+  cancel: function(){
+    Sonia.user.setEditPanel( Sonia.user.DefaultPanel );
   }
 
 });
@@ -281,17 +302,8 @@ Sonia.user.Panel = Ext.extend(Ext.Panel, {
     editPanel.doLayout();
   },
   
- resetPanel: function(){
-    var editPanel = Ext.getCmp('userEditPanel');
-    editPanel.removeAll();
-    editPanel.add({
-      region: 'south',
-      title: 'User Form',
-      padding: 5,
-      xtype: 'panel',
-      html: 'Add or select an User'
-    });
-    editPanel.doLayout();
+  resetPanel: function(){
+   Sonia.user.setEditPanel( Sonia.user.DefaultPanel );
   },
 
   removeUser: function(){