Merge "Ensure correct admin name is logged." into udc-dev