Fixed some form issues which we redirecting somewhere odd