added password and number fields