Fix #378 by duplicating the current form and splitting into two actions.

![image](https://cloud.githubusercontent.com/assets/365751/3213336/0c807c66-ef89-11e3-854a-5c189fa93439.png)