added orga autofill
added submit validation