Updates to the form settings!

Change-Id: Icdd891343d8fc5a476e20a4de9a1f285ada338b1