More cleanup: Added objectguid version of resetpw. Removed local customizations.