fixed addressings in forms