ARMSTWO-168. Corrected user attributes so default used when return value exists but is blank