Closes #694. Validation function didnt seem to do anything so fixed that to check for empty fields. Also removed the code that would allow users to select Org that is not returned from search.