Fixing linking to accounts and url encoding issues
Merge branch 'master' into feature/workflows