Fixed non-user function to remove legacy user credential fields.