Put populateUser() back per #82