[Bug 902786] Merge fix for e.me landing page integration

https://bugzilla.mozilla.org/show_bug.cgi?id=902786

Bug 838634 merged badly. This is a fix for that.