Moving event definitions out of User construction
Fixing webfinger URLs