Fix breakage now that unsigned adds non-user token params