Removed session storage from the cookie and moved it into the form.