forms fix as per https://dev.guardianproject.info/issues/2727
Merge pull request #2 from harlo/master

forms fix as per https://dev.guardianproject.info/issues/2727