Index: xwiki-platform-core/xwiki-core/src/main/resources/ApplicationResources.properties
===================================================================
--- xwiki-platform-core/xwiki-core/src/main/resources/ApplicationResources.properties	(revision 7169)
+++ xwiki-platform-core/xwiki-core/src/main/resources/ApplicationResources.properties	(working copy)
@@ -899,8 +899,9 @@
 changes.classeschanges=Class Changes
 changes.noclasseschanges=No Class Changes
 
-rightsmanager.confirmdeleteuserorgroup=Delete this user or group?
-rightsmanager.confirmdeletemember=Delete this member from the group?
+rightsmanager.confirmdeleteuser=The user __name__ will be deleted and removed from all groups he belongs to. Are you sure you want to proceed?
+rightsmanager.confirmdeletegroup=The group __name__ will be deleted. Are you sure you want to proceed?
+rightsmanager.confirmdeletemember=This user will be deleted from the current group. Are you sure you want to proceed?
 rightsmanager.addnewuser=Add New User
 rightsmanager.addnewgroup=Add New Group
 rightsmanager.duplicateuser=Some users already exist in the group
@@ -917,12 +918,15 @@
 rightsmanager.global=Global
 rightsmanager.local=Local
 rightsmanager.both=Both
-rightsmanager.edituserprofile=For more options to edit this user, please go to the user's profile
-rightsmanager.userprofile=User Profile
+rightsmanager.edituserprofile=For more options to edit this user, please go to the
+rightsmanager.userprofile= user's profile
 rightsmanager.members=Members
 rightsmanager.manage=Manage
 rightsmanager.addnewuser=Add new user
 rightsmanager.addnewgroup=Add new group
+rightsmanager.createnewgroup=Create new group
+rightsmanager.creategroup=Create group
+rightsmanager.groupexist=__name__ cannot be used for the group name, as another document with this name already exists.
 
 ui.ajaxTable.loading=Loading...
 
Index: xwiki-platform-skins/albatross/src/main/resources/albatross/addnewgroup.vm
===================================================================
--- xwiki-platform-skins/albatross/src/main/resources/albatross/addnewgroup.vm	(revision 7169)
+++ xwiki-platform-skins/albatross/src/main/resources/albatross/addnewgroup.vm	(working copy)
@@ -1,9 +1,9 @@
 <div id="addnewgroup">
-<span style="padding-left:13px;">Create new group </span>
-<form method="post">
+<span style="padding-left:13px;">$msg.get("rightsmanager.createnewgroup")</span>
+<form method="post" onsubmit="return false;">
 <div>
-<span style="padding-left:13px;"><input type="text" name="newgroup" value="" /></span>
-<span class="buttonwrapper"><input class="button" type="submit" value="Create Group" onclick="new Ajax.Request('$xwiki.getURL("XWiki.__groupname__", "save", "template=XWiki.XWikiGroupTemplate")'.replace('__groupname__', this.form.newgroup.value), {asynchronous: false}); window.lb.lbSaveForm();" /></span>
+<span style="padding-left:13px;"><input type="text" name="newgroup" value="" id="newgroupi" /></span>
+<span class="buttonwrapper"><input class="button" type="submit" value="$msg.get("rightsmanager.creategroup")" onclick="new Ajax.Request('$xwiki.getURL("XWiki.__groupname__", "save", "template=XWiki.XWikiGroupTemplate")'.replace('__groupname__', this.form.newgroup.value), { onFailure: function(transport) { alert('$msg.get("rightsmanager.groupexist")'.replace('__name__', $('newgroupi').value)); }, onSuccess: function(transport) { window.lb.lbSaveForm(); } });" /></span>
 <br />
 <span class="buttonwrapper"><input class="button" type="submit" name="formactioncancel" value="$msg.get("cancel")" onclick=" window.lb.lbHide(); window.lb.lbClearData(); return false;"/></span>
 </div>
Index: xwiki-platform-skins/albatross/src/main/resources/albatross/admingroups.vm
===================================================================
--- xwiki-platform-skins/albatross/src/main/resources/albatross/admingroups.vm	(revision 7169)
+++ xwiki-platform-skins/albatross/src/main/resources/albatross/admingroups.vm	(working copy)
@@ -50,7 +50,7 @@
 
 #set($addnewurl = $xwiki.getURL("XWiki.XWikiGroups", "view", "xpage=addnewgroup"))
 #set($saveurl = $xwiki.getURL("XWiki.XWikiGroups", "view"))
-#set($redirecturl = $doc.getURL("admin", "editor=groupd&amp;space=XWiki"))
+#set($redirecturl = $doc.getURL("admin", "editor=groups&space=XWiki"))
         
 <script type="text/javascript">
 //<![CDATA[
Index: xwiki-platform-skins/albatross/src/main/resources/albatross/docalreadyexists.vm
===================================================================
--- xwiki-platform-skins/albatross/src/main/resources/albatross/docalreadyexists.vm	(revision 7169)
+++ xwiki-platform-skins/albatross/src/main/resources/albatross/docalreadyexists.vm	(working copy)
@@ -2,6 +2,7 @@
 ### Document already exists message
 ###
 ###
+$response.setStatus(409)
 #template("startpage.vm")
 <div class="main layoutsubsection">
 #if($xwiki.exists("XWiki.DocumentAlreadyExist"))
Index: xwiki-platform-skins/albatross/src/main/resources/albatross/usersandgroups.js
===================================================================
--- xwiki-platform-skins/albatross/src/main/resources/albatross/usersandgroups.js	(revision 7169)
+++ xwiki-platform-skins/albatross/src/main/resources/albatross/usersandgroups.js	(working copy)
@@ -630,7 +630,7 @@
       del.className = 'icon-manageg';
     } else {
       del.src = '$xwiki.getSkinFile("icons/rights-manager/clear.png")';
-      Event.observe(del, 'click', deleteUserOrGroup(i, table, row.fullname));
+      Event.observe(del, 'click', deleteUserOrGroup(i, table, row.fullname, "user"));
       del.className = 'icon-manage';
     }
     del.title = '$msg.get("delete")';
@@ -686,7 +686,7 @@
     var del = document.createElement('img');
     del.src = '$xwiki.getSkinFile("icons/rights-manager/clear.png")';
     del.title = '$msg.get("delete")';
-    Event.observe(del, 'click', deleteUserOrGroup(i, table, row.fullname));
+    Event.observe(del, 'click', deleteUserOrGroup(i, table, row.fullname, "group"));
     del.className = 'icon-manage';
 
     //edit user
@@ -812,18 +812,30 @@
 
 
 //function to delete a user with ajax
-function deleteUserOrGroup(i, table, docname)
+function deleteUserOrGroup(i, table, docname, uorg)
 {
   return function() {
     var url = "?xpage=deleteuorg&docname=" + docname;
-    if (confirm('$msg.get("rightsmanager.confirmdeleteuserorgroup")')) {
-      new Ajax.Request(url, {
-        method: 'get',
-        onSuccess: function(transport) {
-          table.deleteRow(i);
-        }
-      });
+    if(uorg == "user") {
+      if (confirm('$msg.get("rightsmanager.confirmdeleteuser")'.replace('__name__', docname))) {
+        new Ajax.Request(url, {
+            method: 'get',
+            onSuccess: function(transport) {
+              table.deleteRow(i);
+            }
+        });
+      }
     }
+    else {
+      if (confirm('$msg.get("rightsmanager.confirmdeletegroup")'.replace('__name__', docname))) {
+        new Ajax.Request(url, {
+            method: 'get',
+            onSuccess: function(transport) {
+              table.deleteRow(i);
+            }
+        });
+      }
+    }
   }
 }