Re-linked with Paul's.  Also added change principal name functionality