Task 3227: Adding Current User Handler