Subscribe form fixes