Fix current_user to be more legible