repositioned address form and pw fields