Improved initial prompt handling