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

Bug 838634 merged badly. This is a fix for that.