Fixed formbox [MJ-405]

Is actually up to date this time.

All tests pass.