Changes from oustanding PR's against ZfcUser.