This fixes #1301.

This fixes #1301.
We should investigate if it would be better to use standard Django form.