Improved task currentUser handling on move from first phase.