When I return to Thailand it  will be on a 90 day single entry non immigrant visa. During the first 60  days I need to renew my passport before applying to convert to a marriage visa in  the last 30 days. When I get my new passport should I go to the  immigration office to get everything transferred to the new passport  before turning up again to initiate the marriage visa process?