[FIX] Trade: Switch back to trade mode on password form cancel (RT-2762)
Merge pull request #1863 from rht/develop

[FIX] Trade: Switch back to trade mode on password form cancel (RT-2762)