(Issue 641) Don't use compacted version of tenant on user model object
Undefined URL follow-up
Reverting config changes
Merge pull request #1 from nicolaasmatthijs/issue-641

Follow up on #641
Changing to a constructor copy instead of an extend
(Issue 641) Don't create copy of a tenant yet
Doc fixes