Index: kernel/user/register.php
===================================================================
--- kernel/user/register.php	(revision 20561)
+++ kernel/user/register.php	(working copy)
@@ -163,7 +163,6 @@
             // Check if user should be enabled and logged in
             unset($user);
             $user = eZUser::fetch( $object->attribute( 'id' ) );
-            $user->loginCurrent();
 
             $receiver = $user->attribute( 'email' );
             $mail = new eZMail();
@@ -193,9 +192,6 @@
                 $userSetting->setAttribute( 'is_enabled', 0 );
                 $userSetting->store();
 
-                // Log out current user
-                eZUser::logoutCurrent();
-
                 // Create enable account hash and send it to the newly registered user
                 $hash = md5( mktime( ) . $user->attribute( 'contentobject_id' ) );
                 include_once( "kernel/classes/datatypes/ezuser/ezuseraccountkey.php" );
@@ -204,6 +200,10 @@
 
                 $tpl->setVariable( 'hash', $hash );
             }
+            else
+            {
+                $user->loginCurrent();
+            }
 
             $templateResult =& $tpl->fetch( 'design:user/registrationinfo.tpl' );
             $emailSender = $ini->variable( 'MailSettings', 'EmailSender' );