ROOMS-256: Fix double form issue