added password field support