deal with login from email (bug 1095504, bug 1094498)

This copes with preverified login from zimbra and preverified login on device.
I thought the same thing. `"marketplace-app`" seems like a good candidate but I'm not sure if it's worth it. If we start down that road now we'll probably end on it. Could do that and implement a "`marketplace" ` intent too (but not use it yet) to at least avoid making the `"marketplace-app"` one much worse.