diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.xml
index 02513a04037b8f0a56ff895bc6670d357ced3ada..1070f0d8673313bec826e73b50aabdc21bd7ba95 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.xml
@@ -73,7 +73,8 @@
   XXX: if current logged in user is defined in Zope\'s root\n
        acl_folder script will raise ValueError. \n
 """\n
-user_name = context.portal_membership.getAuthenticatedMember()\n
+if user_name is None:\n
+  user_name = context.portal_membership.getAuthenticatedMember()\n
 found_user_list = context.portal_catalog(portal_type=\'Person\', \n
                                          reference=user_name)\n
 found_users = len(found_user_list)\n
@@ -104,7 +105,7 @@ return found_user_list[0].getObject()\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string></string> </value>
+            <value> <string>user_name = None</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -124,15 +125,16 @@ return found_user_list[0].getObject()\n
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>0</int> </value>
+                        <value> <int>1</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
+                            <string>user_name</string>
+                            <string>None</string>
                             <string>_getattr_</string>
                             <string>context</string>
-                            <string>user_name</string>
                             <string>found_user_list</string>
                             <string>len</string>
                             <string>found_users</string>
@@ -149,7 +151,9 @@ return found_user_list[0].getObject()\n
         <item>
             <key> <string>func_defaults</string> </key>
             <value>
-              <none/>
+              <tuple>
+                <none/>
+              </tuple>
             </value>
         </item>
         <item>