Select the correct form of the sentence given the context below.

The origami class, which Tammy and I signed up for, was cancelled due to a paper shortage

or The origami class, that Tammy and I signed up for, was cancelled due to a paper shortage​