Added control to xpath from database and retype password option