user & pass fields added