Updated form.submit to exclude spaces and output correct year of expiry