Updated client validition code - UI Addition