move address up
added in more email logic