Index: standard/src/main/webapp/skins/albatross/adminglobalrights.vm
===================================================================
--- standard/src/main/webapp/skins/albatross/adminglobalrights.vm	(revision 6326)
+++ standard/src/main/webapp/skins/albatross/adminglobalrights.vm	(working copy)
@@ -114,23 +114,21 @@
           </tr>
           <tr id="table-filters">
               <td>
-                <input name="name" type="text" class="filter"/>
-                <input name="progr" type="hidden" value="#if($hasPrgr) true #else false #end" />
-                <input name="admin" type="hidden" value="true" />
-                <input name="reg" type="hidden" value="true" />
-                <input name="clsname" type="hidden" value="$clsname" />
-              </td>
-              <td colspan="4"></td>#if($hasPrgr)<td></td>#end<td></td>
-              <td>
-              #if($context.database != "xwiki") #set($mainwk = false) #else #set($mainwk = true) #end
+                <input name="name" type="text" style="width:65%"/>
+				#if($context.database != "xwiki") #set($mainwk = false) #else #set($mainwk = true) #end
                 #if(!$mainwk) ## display the combobox only in a local wiki
-                <select name="wiki" class="filter">
+                <select name="wiki" style="margin-left:10px;">
                   <option value="local" selected="selected">$msg.get("rightsmanager.local")</option>
                   <option value="global">$msg.get("rightsmanager.global")</option>
                   <option value="both">$msg.get("rightsmanager.both")</option>
                 </select>
                 #else <input type="hidden" value="local" name="wiki" /> #end
-                </td>
+                <input name="progr" type="hidden" value="#if($hasPrgr) true #else false #end" />
+                <input name="admin" type="hidden" value="true" />
+                <input name="reg" type="hidden" value="true" />
+                <input name="clsname" type="hidden" value="$clsname" />
+              </td>
+              <td colspan="5"></td>#if($hasPrgr)<td></td>#end<td></td>
               </tr>
        </thead>
        <tbody id="display1"><tr><td>&nbsp;</td></tr></tbody>
Index: standard/src/main/webapp/skins/albatross/adminspacerights.vm
===================================================================
--- standard/src/main/webapp/skins/albatross/adminspacerights.vm	(revision 6326)
+++ standard/src/main/webapp/skins/albatross/adminspacerights.vm	(working copy)
@@ -110,23 +110,21 @@
           </tr>
           <tr id="table-filters">
               <td>
-                <input name="name" type="text" class="filter" />
+                <input name="name" type="text" style="width:65%"/>
+				#if($context.database != "xwiki") #set($mainwk = false) #else #set($mainwk = true) #end
+                #if(!$mainwk) ## display the combobox only in a local wiki
+                <select name="wiki" style="margin-left:10px;">
+                  <option value="local" selected="selected">$msg.get("rightsmanager.local")</option>
+                  <option value="global">$msg.get("rightsmanager.global")</option>
+                  <option value="both">$msg.get("rightsmanager.both")</option>
+                </select>
+                #else <input type="hidden" value="local" name="wiki" /> #end
 	            <input name="progr" type="hidden" value="#if($hasPrgr) true #else false #end" />
                 <input name="admin" type="hidden" value="true" />
                 <input name="reg" type="hidden" value="false" />
                 <input name="clsname" type="hidden" value="$clsname" />
               </td>
-              <td colspan="4"></td>
-              <td>
-                #if($context.database != "xwiki") #set($mainwk = false) #else #set($mainwk = true) #end
-                #if(!$mainwk) ## display the combobox only for local wiki
-                <select name="wiki" class="filter">
-                  <option value="local" selected="selected">$msg.get("rightsmanager.local")</option>
-                  <option value="global">$msg.get("rightsmanager.global")</option>
-                  <option value="both">$msg.get("rightsmanager.both")</option>
-		        </select>
-		        #else <input type="hidden" value="local" name="wiki" /> #end
-              </td>
+              <td colspan="5"></td>
           </tr>
        </thead>
        <tbody id="display1"><tr><td>&nbsp;</td></tr></tbody>
Index: standard/src/main/webapp/skins/albatross/editrights.vm
===================================================================
--- standard/src/main/webapp/skins/albatross/editrights.vm	(revision 6326)
+++ standard/src/main/webapp/skins/albatross/editrights.vm	(working copy)
@@ -99,23 +99,21 @@
           </tr>
           <tr id="table-filters">
               <td>
-                <input name="name" type="text" class="filter" />
-	        <input name="progr" type="hidden" value="#if($hasPrgr) true #else false #end" />
+                <input name="name" type="text" style="width:65%"/>
+				#if($context.database != "xwiki") #set($mainwk = false) #else #set($mainwk = true) #end
+                #if(!$mainwk) ## display the combobox only in a local wiki
+                <select name="wiki" style="margin-left:10px;">
+                  <option value="local" selected="selected">$msg.get("rightsmanager.local")</option>
+                  <option value="global">$msg.get("rightsmanager.global")</option>
+                  <option value="both">$msg.get("rightsmanager.both")</option>
+                </select>
+                #else <input type="hidden" value="local" name="wiki" /> #end
+	            <input name="progr" type="hidden" value="#if($hasPrgr) true #else false #end" />
                 <input name="admin" type="hidden" value="false" />
                 <input name="reg" type="hidden" value="false" />
                 <input name="clsname" type="hidden" value="$clsname" />
               </td>
-              <td colspan="3"></td>
-              <td>
-                #if($context.database != "xwiki") #set($mainwk = false) #else #set($mainwk = true) #end
-                #if(!$mainwk) ## show combobox only in a local wiki
-                <select name="wiki" class="filter">
-                  <option value="local" selected="selected">$msg.get("rightsmanager.local")</option>
-                  <option value="global">$msg.get("rightsmanager.global")</option>
-                  <option value="both">$msg.get("rightsmanager.both")</option>
-		</select>
-		#else <input type="hidden" value="local" name="wiki" /> #end
-              </td>
+              <td colspan="5"></td>
           </tr>
        </thead>
        <tbody id="display1"><tr><td>&nbsp;</td></tr></tbody>
Index: standard/src/main/webapp/skins/albatross/getusersandgroups.vm
===================================================================
--- standard/src/main/webapp/skins/albatross/getusersandgroups.vm	(revision 6326)
+++ standard/src/main/webapp/skins/albatross/getusersandgroups.vm	(working copy)
@@ -95,13 +95,18 @@
 #foreach( $user in $users )
    #set($wikiname = $user.getWiki())
    #if($wikiname != "xwiki" || $wikiname == $context.database) #set($wikiname = "local") #end
+   #if($wikiname == "xwiki")
+	#set($username = $user.getPrefixedFullName())
+   #else
+	#set($username = $user.fullName)
+   #end
    #set($allows = "")
    #set($denys = "")
    #if( $velocityCount > 1 ) , #end 
    ## get the rights for that user or group
    #foreach($obj in $doc.getObjects($clsname)) ## $clsname = XWiki.XWikiGlobalRights or XWiki.XWikiRights
       #set($pers = "$!obj.getProperty($uorg).getValue()")
-      #if(($pers != "") && ($pers.matches("^(.*,)?${user.fullName}(,.*)?$")) )  
+      #if(($pers != "") && ($pers.matches("^(.*,)?${username}(,.*)?$")) )  
         #if($obj.getProperty('allow').getValue() == 1)
           #set($allows = "$!obj.getProperty('levels').getValue()")
         #else
@@ -110,7 +115,7 @@
       #end
    #end ## second foreach
    {"username"   : "$user.name", 
-    "fullname"   : "$user.fullName",
+    "fullname"   : #if($wikiname=="xwiki") "$user.getPrefixedFullName()" #else "$user.fullName" #end,
     "wikiname"   : "$wikiname", 
     "userurl"    : "$xwiki.getURL($user.fullName)",
     "allows"     : "$allows",
Index: standard/src/main/webapp/skins/albatross/saverights.vm
===================================================================
--- standard/src/main/webapp/skins/albatross/saverights.vm	(revision 6326)
+++ standard/src/main/webapp/skins/albatross/saverights.vm	(working copy)
@@ -25,7 +25,7 @@
               #set($right = "," + $right)
               #set($levels = $levels + $right)
               
-              person: $pers rule: allow action: allow levels: $levels
+              1. person: $pers rule: allow action: allow levels: $levels
               
               $obj.set('levels', $levels) ## set the new levels
             #end
@@ -42,7 +42,7 @@
               #end
             #end  
             
-            person: $pers rule: allow action: deny/clean levels: $levels
+            2. person: $pers rule: allow action: deny/clean levels: $levels
             
             #if($levels != "")
                 $obj.set('levels', $levels) ## set the new levels
@@ -66,7 +66,7 @@
               #set($right = "," + $right)
               #set($levels = $levels + $right)
               
-              pers: $pers rule: deny action:deny levels: $levels
+              3. person: $pers rule: deny action:deny levels: $levels
               
               $obj.set('levels', $levels) ## set the new levels
             #end
@@ -82,7 +82,7 @@
                 #end
               #end  
           
-               pers: $pers rule: deny action: allow/clean levels: $levels
+               4. person: $pers rule: deny action: allow/clean levels: $levels
                
               #if($levels != "")
                 $obj.set('levels', $levels) ## set the new levels
@@ -99,6 +99,8 @@
     #set($pers = $pers.replaceAll("^${fullname}(,|$)", ""))
     #set($pers = $pers.replaceAll("(^|,)${fullname}(,|$)", "$2"))
     $obj.set($uorg, $pers)
+	
+	5. person: $pers
     
   #end
 #end ## end foreach
@@ -110,8 +112,11 @@
 $obj.set($uorg, $fullname)
 $obj.set('levels', $right)
 
-pers: $pers rule: allow action: allow levels: $right
 
+$obj.get($uorg)
+
+6. person: $fullname rule: allow action: allow levels: $right
+
 $obj.set('allow', '1')
 #end
 #if(($foundd == false) && ($action == "deny"))
@@ -121,7 +126,7 @@
 $obj.set($uorg, $fullname)
 $obj.set('levels', $right)
 
-pers: $pers rule: deny action: deny levels: $right
+7. person: $fullname rule: deny action: deny levels: $right
 
 $obj.set('allow', '0')
 #end