User tests: Successful: Unsuccessful:
Note that this includes changes from #934 so you can test that at the same time. They can either be both merged with this pr or done in sequence.
http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=30454
http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=30454