Fix watchdog messages on Block form submit