Premium form regression fixes