Form Bug Fix

Reverting Back. Will deal with subject line later.