Bug fix - password is not required