Correcting from explicit user ID to currently logged in user