Fixed do while loop & validation