diff --git a/kernel/content/ezcontentoperationcollection.php b/kernel/content/ezcontentoperationcollection.php
index <HASH>..<HASH> 100644
--- a/kernel/content/ezcontentoperationcollection.php
+++ b/kernel/content/ezcontentoperationcollection.php
@@ -283,9 +283,9 @@ class eZContentOperationCollection
                         $tmpRes =& eZNodeviewfunctions::generateNodeView( $tpl, $parentNode, $parentNode->attribute( 'object' ), $language, $viewMode, 0, $cacheFileArray['cache_dir'], $cacheFileArray['cache_path'], true );
                     }
                 }
-                // Restore the old user as the current one
-                $user->setCurrentlyLoggedInUser( $user, $user->attribute( 'contentobject_id' ) );
             }
+            // Restore the old user as the current one
+            $user->setCurrentlyLoggedInUser( $user, $user->attribute( 'contentobject_id' ) );
 
             $GLOBALS['eZCurrentAccess']['name'] = $currentSiteAccess;
             $res->setDesignSetting( $currentSiteAccess, 'site' );
#- Moved the restoration of the current user (PreGeneration) to outside of
#  the siteaccess loop.
#  (Manually merged from stable/<I> (<I>) rev. <I>)


git-svn-id: file:///home/patrick.allaert/svn-git/ezp-repo/ezpublish/trunk@<I> a<I>eee8c-daba-<I>-acae-fa<I>f<I>