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