User our data not form data where it matters

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>