Fix an issue with grace period on the client form

Related to issue #531.