Let's flip the flow in the transition flow. Currently we show: 1. "Firefox Marketplace has transitioned to..." screen (https://www.dropbox.com/s/4ui4nfuzi5640b0/Screenshot%202014-11-05%2011.49.30.png?dl=0) 2. "Enter your email..." screen (https://www.dropbox.com/s/kca1r50pw6a1uzs/Screenshot%202014-11-05%2011.50.12.png?dl=0) That should be the other way around. 1. "Enter your email..." screen (https://www.dropbox.com/s/kca1r50pw6a1uzs/Screenshot%202014-11-05%2011.50.12.png?dl=0) 2. If its a persona account, show the "Firefox Marketplace has transitioned to..." screen (https://www.dropbox.com/s/4ui4nfuzi5640b0/Screenshot%202014-11-05%2011.49.30.png?dl=0) otherwise push on to the Firefox Accounts flow.

This may be related to Bug 1093919, which should get the same flow as suggested above after selecting the signon screen from the user settings.

https://github.com/mozilla/zamboni/pull/2713 https://github.com/mozilla/fireplace/pull/773

https://github.com/mozilla/fireplace/commit/d1a9c58b2c0254dcc2ad29247a17aca8af2bac7d https://github.com/mozilla/zamboni/commit/435929dc3aea55cb3abddac20ede3ca6b7e3a3bc

Verified as fixed in FF36(Win7) Persona account not migrated yet: http://screencast.com/t/6aac5aLdNW New FxA account: http://screencast.com/t/79jfzgPewu Existing FxA account: http://screencast.com/t/bBi2s0n5nk