more relative url fixes
Merge branch 'user-activation'