Add Current User Person, fix Current User (PEP-0008)