Fixing linking to accounts and url encoding issues