Fix upgrade
Fix jquery Validation issue on setup