[Bug 902786] Merge fix for e.me landing page integration (bug 838634)
Merge pull request #11440 from EverythingMe/902786

[Bug 902786] Merge fix for e.me landing page integration, r=timdream