JS Validation

- Fixed 2 click validation problem