diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/rightsUI.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/rightsUI.vm
index 600ead9..25a175a 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/rightsUI.vm
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/rightsUI.vm
@@ -90,31 +90,15 @@ $xwiki.ssfx.use('js/xwiki/table/livetable.css', true)
             <tr class="userorgroups-header">
               ## Groups/Users switch
               <th scope="col" class="usersorgroupsnames">
-                ## ToDo: workspace is deprecated
-                #set ($isWorkspace = $services.workspace.isWorkspace($xcontext.database))
+                #if ($xcontext.isMainWiki())
+                  #set ($userScope = 'LOCAL_ONLY')
+                #else
+                  #set ($userScope = $services.wiki.user.userScope)
+                #end 
                 <label for="uorgg" class="hidden">$services.localization.render('rightsmanager.groups')</label>
-                <input type="radio" id="uorgg" name="uorg" value="groups"
-                  onclick="if(!$('unregistered').hasClassName('hidden'))
-                             $('unregistered').addClassName('hidden');
-                         #if ($isWorkspace)
-                           ## Unhide scope selection and automatically select the old index.
-                           if($('usersandgroupstable-filters-scope').hasClassName('hidden')) {
-                             $('usersandgroupstable-filters-scope').removeClassName('hidden');
-                             $('wiki').options[groupScopeIndex].selected=true;
-                           }
-                         #end" checked="checked" />$services.localization.render('rightsmanager.groups')&nbsp;&nbsp;
+                <input type="radio" id="uorgg" name="uorg" value="groups" checked="checked" />$services.localization.render('rightsmanager.groups')&nbsp;&nbsp;
                 <label for="uorgu" class="hidden">$services.localization.render('rightsmanager.users')</label>
-                <input type="radio" id="uorgu" name="uorg" value="users" 
-                  onclick="if($('unregistered').hasClassName('hidden'))
-                             $('unregistered').removeClassName('hidden');
-                         #if ($isWorkspace)
-                           ## Hide scope selection and automatically select global scope.
-                           if(!$('usersandgroupstable-filters-scope').hasClassName('hidden')) {
-                             $('usersandgroupstable-filters-scope').addClassName('hidden');
-                             groupScopeIndex = $('wiki').selectedIndex;
-                             $('wiki').options[1].selected=true;
-                           }
-                         #end" />$services.localization.render('rightsmanager.users')
+                <input type="radio" id="uorgu" name="uorg" value="users" />$services.localization.render('rightsmanager.users')
               </th>
               ## Column headers for each configurable access right
               #foreach ($i in [0..$maxlevel])
@@ -131,8 +115,7 @@ $xwiki.ssfx.use('js/xwiki/table/livetable.css', true)
             <tr id="usersandgroupstable-filters">
               ## Users/groups filter
               <td><label for="name">$services.localization.render('rightsmanager.searchfilter')</label><input id="name" name="name" type="text"/>
-                #if(!$xcontext.isMainWiki()) #set($mainwk = false) #else #set($mainwk = true) #end
-                #if(!$mainwk) ## display the combobox only in a local wiki
+                #if(!$xcontext.isMainWiki()) ## display the combobox only in a local wiki
                   <div id="usersandgroupstable-filters-scope">
                     <label for="wiki">$services.localization.render('rightsmanager.searchscope')</label>
                     <select id="wiki" name="wiki" style="margin-left:10px;">
@@ -217,25 +200,59 @@ $xwiki.ssfx.use('js/xwiki/table/livetable.css', true)
     <script type="text/javascript">
     //<![CDATA[
 (function() {
-  function hideScopeForUsers() {
-    if ($('uorgu').checked) {
-      // Hide scope filter.
+  var hideScope = function() {
+    ## First case: we only handle local users
+    ## It make sense, in that case, to not handle global groups, since we are in a case of an "isolated" wiki
+    #if ($userScope == 'LOCAL_ONLY')
+      ## Then we hide the scope filter
       $('usersandgroupstable-filters-scope').addClassName('hidden');
-      // Default to global.
-      $('wiki').options[1].selected=true;
+      ## And we select the scope 'local'
+      $('wiki').options[0].selected = true;
       
-      return true;
-    } 
-    
+    ## Second case: we handle only glocal users, but **both local and global groups**
+    #elseif ($userScope == 'GLOBAL_ONLY')
+      ## At the loading time, we only hide the scope filter if the users panel is active
+      if ($('uorgu').checked) {
+        ## We hide the scope filter
+        $('usersandgroupstable-filters-scope').addClassName('hidden');
+        ## And we select the scope 'global'
+        $('wiki').options[1].selected = true;
+      }
+      ## We also add some listener to show/hide the scope filter depending on which panel is active: "users" or "groups".
+      $('uorgu').observe('click', function (event) {
+        ## The "users" panel has just been activated
+        ## So we hide the scope filter
+        if(!$('usersandgroupstable-filters-scope').hasClassName('hidden')) {
+          $('usersandgroupstable-filters-scope').addClassName('hidden');
+          ## But we remember what choice has been set by the user
+          groupScopeIndex = $('wiki').selectedIndex;
+          ## And we select the scope 'global'
+          $('wiki').options[1].selected = true;
+        }
+      });
+      $('uorgg').observe('click', function (event) {
+        ## The "groups" panel has just been activated
+        ## So we should show the scope filter (if hidden)
+        if($('usersandgroupstable-filters-scope').hasClassName('hidden')) {
+          $('usersandgroupstable-filters-scope').removeClassName('hidden');
+          ## and we re-set the selected scope
+          $('wiki').options[groupScopeIndex].selected = true;
+        }
+      });
+    #end
+    ## In the last case we handle both local and global users, wo we have nothing to hide
     return false;
   }
   
   function startup() {
     if (XWiki && XWiki.widgets && XWiki.widgets.LiveTable) {
     
-    #if ($isWorkspace)
+    ## If we do not handle both local and global users, we should hide the scope filter that has no sense
+    #if (!$xcontext.isMainWiki() && $userScope != 'LOCAL_AND_GLOBAL')
+      ## Declare a variable that will be used further to store the current scope choosen by the user 
       window.groupScopeIndex = 0;
-      hideScopeForUsers() || Event.observe(window, 'load', hideScopeForUsers);
+      ## Call the function
+      hideScope() || Event.observe(window, 'load', hideScope);
     #end
 
       window.activeRights = [#foreach($i in [0..$maxlevel])"$levelsRights.get($i)",#end];
@@ -250,12 +267,21 @@ $xwiki.ssfx.use('js/xwiki/table/livetable.css', true)
       var chbx${i} = new MSCheckbox($("td${levelsRights.get($i)}"), "${levelsRights.get($i)}", window.saveUrl, "${r.get($i)}");
     #end
       Event.observe(window, 'load', function() {
-        if($('uorgg').checked && !$('unregistered').hasClassName('hidden')) {
+        if($('uorgg').checked) {
           $('unregistered').addClassName('hidden');
-        } else if($('uorgu').checked && $('unregistered').hasClassName('hidden')) {
+        } else if($('uorgu').checked) {
           $('unregistered').removeClassName('hidden');
         }
       });
+      // Show/hide the unregistred checkbox depending on which pane is activated
+      $('uorgg').observe('click', function (event) {
+        // The "groups" panel has just been activated
+        $('unregistered').addClassName('hidden');
+      });
+      $('uorgu').observe('click', function (event) {
+        // The "users" panel has just been activated
+        $('unregistered').removeClassName('hidden');
+      });
     #if("$!editor" == 'globaladmin')
       Event.observe($('authenticate_view'), 'click', setBooleanPropertyFromLiveCheckbox($('authenticate_view'), '$xwiki.getURL('XWiki.XWikiPreferences', 'save', "form_token=$!{services.csrf.getToken()}")', 'XWiki.XWikiPreferences', 0));
       Event.observe($('authenticate_edit'), 'click', setBooleanPropertyFromLiveCheckbox($('authenticate_edit'), '$xwiki.getURL('XWiki.XWikiPreferences', 'save', "form_token=$!{services.csrf.getToken()}")', 'XWiki.XWikiPreferences', 0));
diff --git a/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/rightsUI.vm b/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/rightsUI.vm
index 6ed6d57..38da44e 100644
--- a/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/rightsUI.vm
+++ b/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/rightsUI.vm
@@ -94,30 +94,15 @@ $xwiki.ssfx.use('js/xwiki/table/livetable.css', true)
             <tr class="userorgroups-header">
               ## Groups/Users switch
               <th scope="col" class="usersorgroupsnames">
-                #set ($isWorkspace = $services.workspace.isWorkspace($xcontext.database))
+                #if ($xcontext.isMainWiki())
+                  #set ($userScope = 'LOCAL_ONLY')
+                #else
+                  #set ($userScope = $services.wiki.user.userScope)
+                #end 
                 <label for="uorgg" class="hidden">$services.localization.render('rightsmanager.groups')</label>
-                <input type="radio" id="uorgg" name="uorg" value="groups"
-                  onclick="if(!$('unregistered').hasClassName('hidden'))
-                             $('unregistered').addClassName('hidden');
-                         #if ($isWorkspace)
-                           ## Unhide scope selection and automatically select the old index.
-                           if($('usersandgroupstable-filters-scope').hasClassName('hidden')) {
-                             $('usersandgroupstable-filters-scope').removeClassName('hidden');
-                             $('wiki').options[groupScopeIndex].selected=true;
-                           }
-                         #end" checked="checked" />$services.localization.render('rightsmanager.groups')&nbsp;&nbsp;
+                <input type="radio" id="uorgg" name="uorg" value="groups" checked="checked" />$services.localization.render('rightsmanager.groups')&nbsp;&nbsp;
                 <label for="uorgu" class="hidden">$services.localization.render('rightsmanager.users')</label>
-                <input type="radio" id="uorgu" name="uorg" value="users" 
-                  onclick="if($('unregistered').hasClassName('hidden'))
-                             $('unregistered').removeClassName('hidden');
-                         #if ($isWorkspace)
-                           ## Hide scope selection and automatically select global scope.
-                           if(!$('usersandgroupstable-filters-scope').hasClassName('hidden')) {
-                             $('usersandgroupstable-filters-scope').addClassName('hidden');
-                             groupScopeIndex = $('wiki').selectedIndex;
-                             $('wiki').options[1].selected=true;
-                           }
-                         #end" />$services.localization.render('rightsmanager.users')
+                <input type="radio" id="uorgu" name="uorg" value="users" />$services.localization.render('rightsmanager.users')
               </th>
               ## Column headers for each configurable access right
               #foreach ($i in [0..$maxlevel])
@@ -134,8 +119,7 @@ $xwiki.ssfx.use('js/xwiki/table/livetable.css', true)
             <tr id="usersandgroupstable-filters">
               ## Users/groups filter
               <td><label for="name">$services.localization.render('rightsmanager.searchfilter')</label><input id="name" name="name" type="text"/>
-                #if(!$xcontext.isMainWiki()) #set($mainwk = false) #else #set($mainwk = true) #end
-                #if(!$mainwk) ## display the combobox only in a local wiki
+                #if(!$xcontext.isMainWiki()) ## display the combobox only in a local wiki
                   <div id="usersandgroupstable-filters-scope">
                     <label for="wiki">$services.localization.render('rightsmanager.searchscope')</label>
                     <select id="wiki" name="wiki" style="margin-left:10px;">
@@ -160,7 +144,7 @@ $xwiki.ssfx.use('js/xwiki/table/livetable.css', true)
   </table>
   ## Global settings: mandatory authentication for view/edit, captcha
   #set ($guest_comment_captcha_prop = $doc.getObject('XWiki.XWikiPreferences').getxWikiClass().get('guest_comment_requires_captcha'))
-  #if (("$!request.editor" == 'globaladmin' || "$!editor" == 'globaladmin' || $guest_comment_captcha_prop) && $request.section != 'wikis.right')
+  #if (("$!request.editor" == 'globaladmin' || "$!editor" == 'globaladmin' || $guest_comment_captcha_prop) && $request.section != 'wikis.rights')
     <dl class="rights-settings">
       #if ("$!request.editor" == 'globaladmin' || "$!editor" == 'globaladmin')
         #set ($auth_view = $doc.getObject('XWiki.XWikiPreferences').getProperty('authenticate_view').getValue())
@@ -220,25 +204,59 @@ $xwiki.ssfx.use('js/xwiki/table/livetable.css', true)
     <script type="text/javascript">
     //<![CDATA[
 (function() {
-  function hideScopeForUsers() {
-    if ($('uorgu').checked) {
-      // Hide scope filter.
+  var hideScope = function() {
+    ## First case: we only handle local users
+    ## It make sense, in that case, to not handle global groups, since we are in a case of an "isolated" wiki
+    #if ($userScope == 'LOCAL_ONLY')
+      ## Then we hide the scope filter
       $('usersandgroupstable-filters-scope').addClassName('hidden');
-      // Default to global.
-      $('wiki').options[1].selected=true;
+      ## And we select the scope 'local'
+      $('wiki').options[0].selected = true;
       
-      return true;
-    } 
-    
+    ## Second case: we handle only glocal users, but **both local and global groups**
+    #elseif ($userScope == 'GLOBAL_ONLY')
+      ## At the loading time, we only hide the scope filter if the users panel is active
+      if ($('uorgu').checked) {
+        ## We hide the scope filter
+        $('usersandgroupstable-filters-scope').addClassName('hidden');
+        ## And we select the scope 'global'
+        $('wiki').options[1].selected = true;
+      }
+      ## We also add some listener to show/hide the scope filter depending on which panel is active: "users" or "groups".
+      $('uorgu').observe('click', function (event) {
+        ## The "users" panel has just been activated
+        ## So we hide the scope filter
+        if(!$('usersandgroupstable-filters-scope').hasClassName('hidden')) {
+          $('usersandgroupstable-filters-scope').addClassName('hidden');
+          ## But we remember what choice has been set by the user
+          groupScopeIndex = $('wiki').selectedIndex;
+          ## And we select the scope 'global'
+          $('wiki').options[1].selected = true;
+        }
+      });
+      $('uorgg').observe('click', function (event) {
+        ## The "groups" panel has just been activated
+        ## So we should show the scope filter (if hidden)
+        if($('usersandgroupstable-filters-scope').hasClassName('hidden')) {
+          $('usersandgroupstable-filters-scope').removeClassName('hidden');
+          ## and we re-set the selected scope
+          $('wiki').options[groupScopeIndex].selected = true;
+        }
+      });
+    #end
+    ## In the last case we handle both local and global users, wo we have nothing to hide
     return false;
   }
   
   function startup() {
     if (XWiki && XWiki.widgets && XWiki.widgets.LiveTable) {
     
-    #if ($isWorkspace)
+    ## If we do not handle both local and global users, we should hide the scope filter that has no sense
+    #if (!$xcontext.isMainWiki() && $userScope != 'LOCAL_AND_GLOBAL')
+      ## Declare a variable that will be used further to store the current scope choosen by the user 
       window.groupScopeIndex = 0;
-      hideScopeForUsers() || Event.observe(window, 'load', hideScopeForUsers);
+      ## Call the function
+      hideScope() || Event.observe(window, 'load', hideScope);
     #end
 
       window.activeRights = [#foreach($i in [0..$maxlevel])"$levelsRights.get($i)",#end];
@@ -253,12 +271,21 @@ $xwiki.ssfx.use('js/xwiki/table/livetable.css', true)
       var chbx${i} = new MSCheckbox($("td${levelsRights.get($i)}"), "${levelsRights.get($i)}", window.saveUrl, "${r.get($i)}");
     #end
       Event.observe(window, 'load', function() {
-        if($('uorgg').checked && !$('unregistered').hasClassName('hidden')) {
+        if($('uorgg').checked) {
           $('unregistered').addClassName('hidden');
-        } else if($('uorgu').checked && $('unregistered').hasClassName('hidden')) {
+        } else if($('uorgu').checked) {
           $('unregistered').removeClassName('hidden');
         }
       });
+      // Show/hide the unregistred checkbox depending on which pane is activated
+      $('uorgg').observe('click', function (event) {
+        // The "groups" panel has just been activated
+        $('unregistered').addClassName('hidden');
+      });
+      $('uorgu').observe('click', function (event) {
+        // The "users" panel has just been activated
+        $('unregistered').removeClassName('hidden');
+      });
     #if("$!editor" == 'globaladmin')
       Event.observe($('authenticate_view'), 'click', setBooleanPropertyFromLiveCheckbox($('authenticate_view'), '$xwiki.getURL('XWiki.XWikiPreferences', 'save', "form_token=$!{services.csrf.getToken()}")', 'XWiki.XWikiPreferences', 0));
       Event.observe($('authenticate_edit'), 'click', setBooleanPropertyFromLiveCheckbox($('authenticate_edit'), '$xwiki.getURL('XWiki.XWikiPreferences', 'save', "form_token=$!{services.csrf.getToken()}")', 'XWiki.XWikiPreferences', 0));