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

This copes with preverified login from zimbra and preverified login on device.
Why not do it now if we're updating the manifest though? If it were already in place we wouldn't need to update the package would we?