Change to make wait return currently displayed username after waiting or when username changes