Form Bug Fix

'From' field overwriting client's name with their e-mail address.

E-mail subject should also show client's name for clarity.