Issue #76 - Subscription Form corrections