diff --git a/src/client/app/components/admin/PreferencesComponent.tsx b/src/client/app/components/admin/PreferencesComponent.tsx
index 265244c48..b911aebbd 100644
--- a/src/client/app/components/admin/PreferencesComponent.tsx
+++ b/src/client/app/components/admin/PreferencesComponent.tsx
@@ -10,9 +10,9 @@ import { Button, Input, FormFeedback } from 'reactstrap';
 import { UnsavedWarningComponent } from '../UnsavedWarningComponent';
 import { preferencesApi } from '../../redux/api/preferencesApi';
 import {
-	MIN_DATE, MIN_DATE_MOMENT, MAX_DATE, MAX_DATE_MOMENT, MAX_VAL, MIN_VAL, MAX_ERRORS
+	MIN_DATE, MIN_DATE_MOMENT, MAX_DATE, MAX_DATE_MOMENT, MAX_ERRORS
 } from '../../redux/selectors/adminSelectors';
-import { PreferenceRequestItem, TrueFalseType } from '../../types/items';
+import { PreferenceRequestItem } from '../../types/items';
 import { ChartTypes } from '../../types/redux/graph';
 import { LanguageTypes } from '../../types/redux/i18n';
 import { AreaUnitType } from '../../utils/getAreaUnitConversion';
@@ -53,16 +53,6 @@ export default function PreferencesComponent() {
 			const frequency = moment.duration(localAdminPref.defaultMeterReadingFrequency);
 			return !frequency.isValid() || frequency.asSeconds() <= 0;
 		},
-		minValue: (): boolean => {
-			const min = Number(localAdminPref.defaultMeterMinimumValue);
-			const max = Number(localAdminPref.defaultMeterMaximumValue);
-			return min < MIN_VAL || min > max;
-		},
-		maxValue: (): boolean => {
-			const min = Number(localAdminPref.defaultMeterMinimumValue);
-			const max = Number(localAdminPref.defaultMeterMaximumValue);
-			return max > MAX_VAL || min > max;
-		},
 		minDate: (): boolean => {
 			const minMoment = moment(localAdminPref.defaultMeterMinimumDate);
 			const maxMoment = moment(localAdminPref.defaultMeterMaximumDate);
@@ -197,40 +187,6 @@ export default function PreferencesComponent() {
 					<FormattedMessage id="invalid.input" ></FormattedMessage>
 				</FormFeedback>
 			</div>
-			<div>
-				<p className='mt-2' style={titleStyle}>
-					{`${translate('default.meter.minimum.value')}:`}
-				</p>
-				<Input
-					type='number'
-					value={localAdminPref.defaultMeterMinimumValue}
-					onChange={e => makeLocalChanges('defaultMeterMinimumValue', e.target.value)}
-					min={MIN_VAL}
-					max={Number(localAdminPref.defaultMeterMaximumValue)}
-					maxLength={50}
-					invalid={invalidFuncs.minValue()}
-				/>
-				<FormFeedback>
-					<FormattedMessage id="error.bounds" values={{ min: MIN_VAL, max: Number(localAdminPref.defaultMeterMaximumValue) }} />
-				</FormFeedback>
-			</div>
-			<div>
-				<p className='mt-2' style={titleStyle}>
-					{`${translate('default.meter.maximum.value')}:`}
-				</p>
-				<Input
-					type='number'
-					value={localAdminPref.defaultMeterMaximumValue}
-					onChange={e => makeLocalChanges('defaultMeterMaximumValue', e.target.value)}
-					min={Number(localAdminPref.defaultMeterMinimumValue)}
-					max={MAX_VAL}
-					maxLength={50}
-					invalid={invalidFuncs.maxValue()}
-				/>
-				<FormFeedback>
-					<FormattedMessage id="error.bounds" values={{ min: Number(localAdminPref.defaultMeterMinimumValue), max: MAX_VAL }} />
-				</FormFeedback>
-			</div>
 			<div>
 				<p className='mt-2' style={titleStyle}>
 					{`${translate('default.meter.minimum.date')}:`}
@@ -294,19 +250,6 @@ export default function PreferencesComponent() {
 					<FormattedMessage id="error.bounds" values={{ min: 0, max: MAX_ERRORS }} />
 				</FormFeedback>
 			</div>
-			<div>
-				<p className='mt-2' style={titleStyle}>
-					{`${translate('default.meter.disable.checks')}:`}
-				</p>
-				<Input
-					type='select'
-					value={localAdminPref.defaultMeterDisableChecks?.toString()}
-					onChange={e => makeLocalChanges('defaultMeterDisableChecks', e.target.value)}>
-					{Object.keys(TrueFalseType).map(key => {
-						return (<option value={key} key={key}>{translate(`TrueFalseType.${key}`)}</option>);
-					})}
-				</Input>
-			</div>
 			<div>
 				<h3 className='border-bottom mt-3'>{translate('site.settings')}</h3>
 				<div>
diff --git a/src/client/app/components/meters/CreateMeterModalComponent.tsx b/src/client/app/components/meters/CreateMeterModalComponent.tsx
index 1673b05f3..11017ca31 100644
--- a/src/client/app/components/meters/CreateMeterModalComponent.tsx
+++ b/src/client/app/components/meters/CreateMeterModalComponent.tsx
@@ -29,6 +29,8 @@ import { useTranslate } from '../../redux/componentHooks';
 import TimeZoneSelect from '../TimeZoneSelect';
 import TooltipHelpComponent from '../TooltipHelpComponent';
 import TooltipMarkerComponent from '../TooltipMarkerComponent';
+import { selectUnitDataById } from '../../redux/api/unitsApi';
+import { DisableChecksType } from '../../types/redux/units';
 
 interface CreateMeterModalProps {
 	onCreateMeter?: (meterIdentifier: string) => void; // Define the type of the callback function
@@ -52,9 +54,10 @@ export default function CreateMeterModalComponent(props: CreateMeterModalProps):
 	const [showModal, setShowModal] = useState(false);
 
 	// Handlers for each type of input change
-	const [meterDetails, setMeterDetails] = useState(defaultValues);
+	const [meterDetails, setMeterDetails] = useState({...defaultValues, minVal: MIN_VAL, maxVal: MAX_VAL, disableChecks: DisableChecksType.reject_all});
 	const unitIsSelected = meterDetails.unitId !== -999;
 	const defaultGaphicUnitIsSelected = meterDetails.defaultGraphicUnit !== -999;
+	const unitsDataById = useAppSelector(selectUnitDataById);
 
 	const { compatibleGraphicUnits, incompatibleGraphicUnits, compatibleUnits } = useAppSelector(state =>
 		// Type assertion due to conflicting GPS Property
@@ -92,9 +95,25 @@ export default function CreateMeterModalComponent(props: CreateMeterModalProps):
 	const handleTimeZoneChange = (timeZone: string) => {
 		setMeterDetails({ ...meterDetails, ['timeZone']: timeZone });
 	};
+
+	const handleUnitChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+		const selectedUnitId = Number(e.target.value);
+		const selectedUnit = unitsDataById[selectedUnitId];
+
+		if (selectedUnit) {
+			setMeterDetails(details => ({
+				...details,
+				unitId: selectedUnitId,
+				minVal: selectedUnit.minVal,
+				maxVal: selectedUnit.maxVal,
+				disableChecks: selectedUnit.disableChecks
+			}));
+		}
+	};
+
 	// Reset the state to default values
 	const resetState = () => {
-		setMeterDetails(defaultValues);
+		setMeterDetails({...defaultValues, minVal: MIN_VAL, maxVal: MAX_VAL, disableChecks: DisableChecksType.reject_all});
 	};
 
 	const handleClose = () => {
@@ -242,9 +261,7 @@ export default function CreateMeterModalComponent(props: CreateMeterModalProps):
 							</Label>
 							<Input id='unitId' name='unitId' type='select'
 								value={meterDetails.unitId}
-								onChange={e => {
-									handleNumberChange(e);
-								}}
+								onChange={handleUnitChange}
 								invalid={!unitIsSelected}>
 								<option value={-999} key={-999} hidden disabled>
 									{translate('select.unit')}
@@ -541,12 +558,12 @@ export default function CreateMeterModalComponent(props: CreateMeterModalProps):
 					<Row xs='1' lg='2'>
 						{/* minVal input */}
 						<Col><FormGroup>
-							<Label for='minVal'>{translate('meter.minVal')}</Label>
+							<Label for='minVal'>{translate('min.value')}</Label>
 							<Input id='minVal' name='minVal' type='number'
 								onChange={e => handleNumberChange(e)}
 								min={MIN_VAL}
 								max={meterDetails.maxVal}
-								defaultValue={meterDetails.minVal}
+								value={meterDetails.minVal}
 								invalid={meterDetails?.minVal < MIN_VAL || meterDetails?.minVal > meterDetails?.maxVal} />
 							<FormFeedback>
 								<FormattedMessage id="error.bounds" values={{ min: MIN_VAL, max: meterDetails.maxVal }} />
@@ -554,12 +571,12 @@ export default function CreateMeterModalComponent(props: CreateMeterModalProps):
 						</FormGroup></Col>
 						{/* maxVal input */}
 						<Col><FormGroup>
-							<Label for='maxVal'>{translate('meter.maxVal')}</Label>
+							<Label for='maxVal'>{translate('max.value')}</Label>
 							<Input id='maxVal' name='maxVal' type='number'
 								onChange={e => handleNumberChange(e)}
 								min={meterDetails.minVal}
 								max={MAX_VAL}
-								defaultValue={meterDetails.maxVal}
+								value={meterDetails.maxVal}
 								invalid={meterDetails?.maxVal > MAX_VAL || meterDetails?.minVal > meterDetails?.maxVal} />
 							<FormFeedback>
 								<FormattedMessage id="error.bounds" values={{ min: meterDetails.minVal, max: MAX_VAL }} />
@@ -614,17 +631,14 @@ export default function CreateMeterModalComponent(props: CreateMeterModalProps):
 							</FormFeedback>
 						</FormGroup></Col>
 						<Col><FormGroup>
-							<Label for='disableChecks'>{translate('meter.disableChecks')}</Label>
+							<Label for='disableChecks'>{translate('disable.checks')}</Label>
 							<Input id='disableChecks' name='disableChecks' type='select'
-								defaultValue={meterDetails.disableChecks?.toString()}
-								onChange={e => handleBooleanChange(e)}>
-								{
-									Object.keys(TrueFalseType).map(key =>
-										<option value={key} key={key}>
-											{translate(`TrueFalseType.${key}`)}
-										</option>
-									)
-								}
+								value={meterDetails.disableChecks}
+								onChange={e => handleStringChange(e)}>
+								{Object.keys(DisableChecksType).map(key => {
+									return (<option value={key} key={key} >
+										{translate(`DisableChecksType.${key}`)}</option>);
+								})}
 							</Input>
 						</FormGroup></Col>
 					</Row>
diff --git a/src/client/app/components/meters/EditMeterModalComponent.tsx b/src/client/app/components/meters/EditMeterModalComponent.tsx
index 59afc37a7..56d5172be 100644
--- a/src/client/app/components/meters/EditMeterModalComponent.tsx
+++ b/src/client/app/components/meters/EditMeterModalComponent.tsx
@@ -21,7 +21,7 @@ import '../../styles/modal.css';
 import { tooltipBaseStyle } from '../../styles/modalStyle';
 import { TrueFalseType } from '../../types/items';
 import { MeterData, MeterTimeSortType, MeterType } from '../../types/redux/meters';
-import { UnitRepresentType } from '../../types/redux/units';
+import { DisableChecksType, UnitRepresentType } from '../../types/redux/units';
 import { GPSPoint, isValidGPSInput } from '../../utils/calibration';
 import { AreaUnitType } from '../../utils/getAreaUnitConversion';
 import { getGPSString, nullToEmptyString } from '../../utils/input';
@@ -67,6 +67,19 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 
 	const [validMeter, setValidMeter] = useState(isValidMeter(localMeterEdits));
 
+	// Ensure `minVal`, `maxVal` and `disableChecks` are set based on the unit on load
+	useEffect(() => {
+		const selectedUnit = unitDataById[localMeterEdits.unitId];
+		if (selectedUnit) {
+			setLocalMeterEdits(edits => ({
+				...edits,
+				minVal: selectedUnit.minVal,
+				maxVal: selectedUnit.maxVal,
+				disableChecks: selectedUnit.disableChecks
+			}));
+		}
+	}, [localMeterEdits.unitId]);
+
 	useEffect(() => { setValidMeter(isValidMeter(localMeterEdits)); }, [localMeterEdits]);
 	/* End State */
 
@@ -76,6 +89,17 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 		}
 	}, [localMeterEdits.cumulative]);
 
+	const handleUnitChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+		const selectedUnitId = Number(e.target.value);
+		const selectedUnit = unitDataById[selectedUnitId];
+		if (selectedUnit) {
+			setLocalMeterEdits({
+				...localMeterEdits,
+				unitId: selectedUnitId
+			});
+		}
+	};
+
 	// Save changes
 	// Currently using the old functionality which is to compare inherited prop values to state values
 	// If there is a difference between props and state, then a change was made
@@ -279,7 +303,7 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 								name='unitId'
 								type='select'
 								value={localMeterEdits.unitId}
-								onChange={e => handleNumberChange(e)}>
+								onChange={handleUnitChange}>
 								{Array.from(compatibleUnits).map(unit => {
 									return (<option value={unit.id} key={unit.id}>{unit.identifier}</option>);
 								})}
@@ -599,7 +623,7 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 					<Row xs='1' lg='2'>
 						{/* minVal input */}
 						<Col><FormGroup>
-							<Label for='minVal'>{translate('meter.minVal')}</Label>
+							<Label for='minVal'>{translate('min.value')}</Label>
 							<Input
 								id='minVal'
 								name='minVal'
@@ -615,7 +639,7 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 						</FormGroup></Col>
 						{/* maxVal input */}
 						<Col><FormGroup>
-							<Label for='maxVal'>{translate('meter.maxVal')}</Label>
+							<Label for='maxVal'>{translate('max.value')}</Label>
 							<Input
 								id='maxVal'
 								name='maxVal'
@@ -687,16 +711,16 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 						</FormGroup></Col>
 						{/* DisableChecks input */}
 						<Col><FormGroup>
-							<Label for='disableChecks'>{translate('meter.disableChecks')}</Label>
+							<Label for='disableChecks'>{translate('disable.checks')}</Label>
 							<Input
 								id='disableChecks'
 								name='disableChecks'
 								type='select'
-								value={localMeterEdits?.disableChecks?.toString()}
-								onChange={e => handleBooleanChange(e)}
-								invalid={localMeterEdits?.disableChecks && localMeterEdits.unitId === -99}>
-								{Object.keys(TrueFalseType).map(key => {
-									return (<option value={key} key={key}>{translate(`TrueFalseType.${key}`)}</option>);
+								value={localMeterEdits.disableChecks}
+								onChange={e => handleStringChange(e)}>
+								{Object.keys(DisableChecksType).map(key => {
+									return (<option value={key} key={key} >
+										{translate(`DisableChecksType.${key}`)}</option>);
 								})}
 							</Input>
 						</FormGroup></Col>
diff --git a/src/client/app/components/unit/CreateUnitModalComponent.tsx b/src/client/app/components/unit/CreateUnitModalComponent.tsx
index 0079079c0..119cfd012 100644
--- a/src/client/app/components/unit/CreateUnitModalComponent.tsx
+++ b/src/client/app/components/unit/CreateUnitModalComponent.tsx
@@ -10,11 +10,12 @@ import '../../styles/modal.css';
 import { TrueFalseType } from '../../types/items';
 import TooltipMarkerComponent from '../TooltipMarkerComponent';
 import TooltipHelpComponent from '../../components/TooltipHelpComponent';
-import { UnitRepresentType, DisplayableType, UnitType } from '../../types/redux/units';
+import { UnitRepresentType, DisplayableType, UnitType, DisableChecksType } from '../../types/redux/units';
 import { tooltipBaseStyle } from '../../styles/modalStyle';
 import { unitsApi } from '../../redux/api/unitsApi';
 import { useTranslate } from '../../redux/componentHooks';
 import { showSuccessNotification, showErrorNotification } from '../../utils/notifications';
+import { MAX_VAL, MIN_VAL } from '../../redux/selectors/adminSelectors';
 import { LineGraphRates } from '../../types/redux/graph';
 import { customRateValid, isCustomRate } from '../../utils/unitInput';
 
@@ -41,7 +42,10 @@ export default function CreateUnitModalComponent() {
 		// The client code makes the id for the selected unit and default graphic unit be -99
 		// so it can tell it is not yet assigned and do the correct logic for that case.
 		// The units API expects these values to be undefined on call so that the database can assign their values.
-		id: -99
+		id: -99,
+		minVal: MIN_VAL,
+		maxVal: MAX_VAL,
+		disableChecks: DisableChecksType.reject_all
 	};
 
 	/* State */
@@ -72,6 +76,10 @@ export default function CreateUnitModalComponent() {
 		setState({ ...state, [e.target.name]: JSON.parse(e.target.value) });
 	};
 
+	const handleNumberChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+		setState({ ...state, [e.target.name]: Number(e.target.value) });
+	};
+
 	/**
 	 * Updates the rate (both custom and regular state) including setting if custom.
 	 * @param newRate The new rate to set.
@@ -132,6 +140,7 @@ export default function CreateUnitModalComponent() {
 		// - The custom rate is a positive integer
 		const validUnit = state.name !== '' &&
 			(state.typeOfUnit !== UnitType.suffix || state.suffix !== '') && state.secInRate !== Number(CUSTOM_INPUT)
+			&& state?.minVal >= MIN_VAL && state?.maxVal <= MAX_VAL && state?.minVal <= state?.maxVal
 			&& customRateValid(Number(state.secInRate));
 		setCanSave(validUnit);
 	}, [state]);
@@ -423,16 +432,57 @@ export default function CreateUnitModalComponent() {
 								</FormGroup>
 							</Col>
 						</Row>
+						<Row xs='1' lg='2'>
+							{/* minVal input */}
+							<Col><FormGroup>
+								<Label for='minVal'>{translate('min.value')}</Label>
+								<Input id='minVal' name='minVal' type='number'
+									onChange={e => handleNumberChange(e)}
+									min={MIN_VAL}
+									max={state.maxVal}
+									defaultValue={state.minVal}
+									invalid={state?.minVal < MIN_VAL || state?.minVal > state?.maxVal} />
+								<FormFeedback>
+									<FormattedMessage id="error.bounds" values={{ min: MIN_VAL, max: state.maxVal }} />
+								</FormFeedback>
+							</FormGroup></Col>
+							{/* maxVal input */}
+							<Col><FormGroup>
+								<Label for='maxVal'>{translate('max.value')}</Label>
+								<Input id='maxVal' name='maxVal' type='number'
+									onChange={e => handleNumberChange(e)}
+									min={state.minVal}
+									max={MAX_VAL}
+									defaultValue={state.maxVal}
+									invalid={state?.maxVal > MAX_VAL || state?.minVal > state?.maxVal} />
+								<FormFeedback>
+									<FormattedMessage id="error.bounds" values={{ min: state.minVal, max: MAX_VAL }} />
+								</FormFeedback>
+							</FormGroup></Col>
+						</Row>
+						<Row xs='1' lg='2'>
+							{/* DisableChecks input */}
+							<Col><FormGroup>
+								<Label for='disableChecks'>{translate('disable.checks')}</Label>
+								<Input id='disableChecks' name='disableChecks' type='select'
+									onChange={e => handleStringChange(e)}
+									defaultValue={state.disableChecks}>
+									{Object.keys(DisableChecksType).map(key => {
+										return (<option value={key} key={key} >
+											{translate(`DisableChecksType.${key}`)}</option>);
+									})}
+								</Input>
+							</FormGroup></Col>
+						</Row>
 						{/* Note input */}
 						<FormGroup>
-							<Label for="note">{translate('note')}</Label>
+							<Label for='note'>{translate('note')}</Label>
 							<Input
-								id="note"
-								name="note"
-								type="textarea"
+								id='note'
+								name='note'
+								type='textarea'
 								value={state.note}
-								onChange={e => handleStringChange(e)}
-							/>
+								onChange={e => handleStringChange(e)} />
 						</FormGroup>
 					</Container>
 				</ModalBody>
diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index 5bb6673bb..15fec3268 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -16,11 +16,12 @@ import { useAppSelector } from '../../redux/reduxHooks';
 import '../../styles/modal.css';
 import { tooltipBaseStyle } from '../../styles/modalStyle';
 import { TrueFalseType } from '../../types/items';
-import { DisplayableType, UnitData, UnitRepresentType, UnitType } from '../../types/redux/units';
+import { DisableChecksType, DisplayableType, UnitData, UnitRepresentType, UnitType } from '../../types/redux/units';
 import { conversionArrow } from '../../utils/conversionArrow';
 import { showErrorNotification, showSuccessNotification } from '../../utils/notifications';
 import ConfirmActionModalComponent from '../ConfirmActionModalComponent';
 import TooltipMarkerComponent from '../TooltipMarkerComponent';
+import { MAX_VAL, MIN_VAL } from '../../redux/selectors/adminSelectors';
 import { LineGraphRates } from '../../types/redux/graph';
 import { customRateValid, isCustomRate } from '../../utils/unitInput';
 
@@ -77,6 +78,10 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 		setState({ ...state, [e.target.name]: JSON.parse(e.target.value) });
 	};
 
+	const handleNumberChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+		setState({ ...state, [e.target.name]: Number(e.target.value) });
+	};
+
 	/**
 	 * Updates the rate (both custom and regular state) including setting if custom.
 	 * @param newRate The new rate to set.
@@ -198,6 +203,7 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 		// - The custom rate is a positive integer
 		const validUnit = state.name !== '' &&
 			(state.typeOfUnit !== UnitType.suffix || state.suffix !== '') && state.secInRate !== Number(CUSTOM_INPUT)
+			&& state?.minVal >= MIN_VAL && state?.maxVal <= MAX_VAL && state?.minVal <= state?.maxVal
 			&& customRateValid(Number(state.secInRate));
 		// Compare original props to state to see if edit made. Check above avoids thinking edit happened if
 		// custom edit started without enter hit.
@@ -210,7 +216,10 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 			|| props.unit.preferredDisplay !== state.preferredDisplay
 			|| props.unit.secInRate !== state.secInRate
 			|| props.unit.suffix !== state.suffix
-			|| props.unit.note !== state.note;
+			|| props.unit.note !== state.note
+			|| props.unit.minVal != state.minVal
+			|| props.unit.maxVal != state.maxVal
+			|| props.unit.disableChecks != state.disableChecks;
 		setCanSave(validUnit && editMade);
 	}, [state]);
 
@@ -554,9 +563,51 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 								</FormGroup>
 							</Col>
 						</Row>
+						<Row xs='1' lg='2'>
+							{/* minVal input */}
+							<Col><FormGroup>
+								<Label for='minVal'>{translate('min.value')}</Label>
+								<Input id='minVal' name='minVal' type='number'
+									onChange={e => handleNumberChange(e)}
+									min={MIN_VAL}
+									max={state.maxVal}
+									required value={state.minVal}
+									invalid={state?.minVal < MIN_VAL || state?.minVal > state?.maxVal} />
+								<FormFeedback>
+									<FormattedMessage id="error.bounds" values={{ min: MIN_VAL, max: state.maxVal }} />
+								</FormFeedback>
+							</FormGroup></Col>
+							{/* maxVal input */}
+							<Col><FormGroup>
+								<Label for='maxVal'>{translate('max.value')}</Label>
+								<Input id='maxVal' name='maxVal' type='number'
+									onChange={e => handleNumberChange(e)}
+									min={state.minVal}
+									max={MAX_VAL}
+									required value={state.maxVal}
+									invalid={state?.maxVal > MAX_VAL || state?.minVal > state?.maxVal} />
+								<FormFeedback>
+									<FormattedMessage id="error.bounds" values={{ min: state.minVal, max: MAX_VAL }} />
+								</FormFeedback>
+							</FormGroup></Col>
+						</Row>
+						<Row xs='1' lg='2'>
+							{/* DisableChecks input */}
+							<Col><FormGroup>
+								<Label for='disableChecks'>{translate('disable.checks')}</Label>
+								<Input id='disableChecks' name='disableChecks' type='select'
+									onChange={e => handleStringChange(e)}
+									value={state.disableChecks}>
+									{Object.keys(DisableChecksType).map(key => {
+										return (<option value={key} key={key} >
+											{translate(`DisableChecksType.${key}`)}</option>);
+									})}
+								</Input>
+							</FormGroup></Col>
+						</Row>
 						{/* Note input */}
 						<FormGroup>
-							<Label for='note'>{translate('note')}</Label>
+							<Label for='note'>{translate('unit')}</Label>
 							<Input
 								id='note'
 								name='note'
@@ -564,8 +615,7 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 								value={state.note}
 								onChange={e => handleStringChange(e)} />
 						</FormGroup>
-					</Container>
-				</ModalBody>
+					</Container></ModalBody>
 				<ModalFooter>
 					<Button variant="warning" color='danger' onClick={handleDeleteConfirmationModalOpen}>
 						<FormattedMessage id="unit.delete.unit" />
diff --git a/src/client/app/redux/selectors/adminSelectors.ts b/src/client/app/redux/selectors/adminSelectors.ts
index eaefebe3e..02adf9b2a 100644
--- a/src/client/app/redux/selectors/adminSelectors.ts
+++ b/src/client/app/redux/selectors/adminSelectors.ts
@@ -307,12 +307,9 @@ export const selectDefaultCreateMeterValues = createAppSelector(
 			previousEnd: '',
 			areaUnit: AreaUnitType.none,
 			readingFrequency: adminPreferences.defaultMeterReadingFrequency,
-			minVal: adminPreferences.defaultMeterMinimumValue,
-			maxVal: adminPreferences.defaultMeterMaximumValue,
 			minDate: adminPreferences.defaultMeterMinimumDate,
 			maxDate: adminPreferences.defaultMeterMaximumDate,
-			maxError: adminPreferences.defaultMeterMaximumErrors,
-			disableChecks: adminPreferences.defaultMeterDisableChecks
+			maxError: adminPreferences.defaultMeterMaximumErrors
 		};
 		return defaultValues;
 	}
diff --git a/src/client/app/redux/slices/adminSlice.ts b/src/client/app/redux/slices/adminSlice.ts
index 932b01d8d..55d0c8a7f 100644
--- a/src/client/app/redux/slices/adminSlice.ts
+++ b/src/client/app/redux/slices/adminSlice.ts
@@ -28,13 +28,10 @@ export const defaultAdminState: AdminState = {
 	defaultAreaNormalization: false,
 	defaultAreaUnit: AreaUnitType.none,
 	defaultMeterReadingFrequency: '00:15:00',
-	defaultMeterMinimumValue: Number.MIN_SAFE_INTEGER,
-	defaultMeterMaximumValue: Number.MAX_SAFE_INTEGER,
 	defaultMeterMinimumDate: moment(0).utc().format('YYYY-MM-DD HH:mm:ssZ'),
 	defaultMeterMaximumDate: moment(0).utc().add(5000, 'years').format('YYYY-MM-DD HH:mm:ssZ'),
 	defaultMeterReadingGap: 0,
 	defaultMeterMaximumErrors: 75,
-	defaultMeterDisableChecks: false,
 	defaultHelpUrl: ''
 };
 
@@ -103,14 +100,6 @@ export const adminSlice = createSlice({
 			state.defaultMeterReadingFrequency = action.payload;
 			state.submitted = false;
 		},
-		updateDefaultMeterMinimumValue: (state, action: PayloadAction<number>) => {
-			state.defaultMeterMinimumValue = action.payload;
-			state.submitted = false;
-		},
-		updateDefaultMeterMaximumValue: (state, action: PayloadAction<number>) => {
-			state.defaultMeterMaximumValue = action.payload;
-			state.submitted = false;
-		},
 		updateDefaultMeterMinimumDate: (state, action: PayloadAction<string>) => {
 			state.defaultMeterMinimumDate = action.payload;
 			state.submitted = false;
@@ -127,10 +116,6 @@ export const adminSlice = createSlice({
 			state.defaultMeterMaximumErrors = action.payload;
 			state.submitted = false;
 		},
-		updateDefaultMeterDisableChecks: (state, action: PayloadAction<boolean>) => {
-			state.defaultMeterDisableChecks = action.payload;
-			state.submitted = false;
-		},
 		updateDefaultHelpUrl: (state, action: PayloadAction<string>) => {
 			state.defaultHelpUrl = action.payload;
 			state.submitted = false;
@@ -159,13 +144,10 @@ export const {
 	updateDefaultFileSizeLimit,
 	updateDefaultAreaUnit,
 	updateDefaultMeterReadingFrequency,
-	updateDefaultMeterMinimumValue,
-	updateDefaultMeterMaximumValue,
 	updateDefaultMeterMinimumDate,
 	updateDefaultMeterMaximumDate,
 	updateDefaultMeterReadingGap,
-	updateDefaultMeterMaximumErrors,
-	updateDefaultMeterDisableChecks
+	updateDefaultMeterMaximumErrors
 } = adminSlice.actions;
 
 export const {
@@ -188,13 +170,10 @@ export const selectAdminPreferences = createAppSelector(
 		defaultAreaNormalization: adminState.defaultAreaNormalization,
 		defaultAreaUnit: adminState.defaultAreaUnit,
 		defaultMeterReadingFrequency: adminState.defaultMeterReadingFrequency,
-		defaultMeterMinimumValue: adminState.defaultMeterMinimumValue,
-		defaultMeterMaximumValue: adminState.defaultMeterMaximumValue,
 		defaultMeterMinimumDate: adminState.defaultMeterMinimumDate,
 		defaultMeterMaximumDate: adminState.defaultMeterMaximumDate,
 		defaultMeterReadingGap: adminState.defaultMeterReadingGap,
 		defaultMeterMaximumErrors: adminState.defaultMeterMaximumErrors,
-		defaultMeterDisableChecks: adminState.defaultMeterDisableChecks,
 		defaultHelpUrl: adminState.defaultHelpUrl
 	})
 );
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 5d0858c6c..78337d254 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -145,6 +145,10 @@ const LocaleTranslationData = {
 		"delete.user": "Delete User",
 		"descending": "Descending",
 		"disable": "Disable",
+		"disable.checks": "Disable Checks",
+		"DisableChecksType.reject_all": "No, reject all readings in batch",
+		"DisableChecksType.reject_bad": "No, only reject the bad reading(s)",
+		"DisableChecksType.reject_none": "Yes, do not check values",
 		"discard.changes": "Discard Changes",
 		"displayable": "Displayable:",
 		"DisplayableType.admin": "admin",
@@ -155,7 +159,7 @@ const LocaleTranslationData = {
 		"edit.a.meter": "Edit a Meter",
 		"edit.group": "Edit Group",
 		"edit.meter": "Details/Edit Meter",
-		"edit.unit": "Edit Unit",
+		"edit.unit": "Details/Edit Unit",
 		"edit.user": "Edit User",
 		"edited": "edited",
 		"enable": "Enable",
@@ -336,6 +340,7 @@ const LocaleTranslationData = {
 		"map.upload.new.file": "Redo",
 		"maps": "Maps",
 		"max": "max",
+		"max.value": "Maximum Reading Value Check",
 		"menu": "Menu",
 		"meter": "Meter",
 		"meter.create": "Create a Meter",
@@ -382,6 +387,7 @@ const LocaleTranslationData = {
 		"meter.url": "URL:",
 		"meters": "Meters",
 		"min": "min",
+		"min.value": "Minimum Reading Value Check",
 		"minute": "Minute",
 		"more.energy": "more energy",
 		"more.options": "More Options",
@@ -683,6 +689,10 @@ const LocaleTranslationData = {
 		"delete.user": "Supprimer l'utilisateur",
 		"descending": "Descendant",
 		"disable": "Désactiver",
+		"disable.checks": "Disable Checks\u{26A1}",
+		"DisableChecksType.reject_all": "No, reject all readings in batch\u{26A1}",
+		"DisableChecksType.reject_bad": "No, only reject the bad reading(s)\u{26A1}",
+		"DisableChecksType.reject_none": "Yes, do not check values\u{26A1}",
 		"discard.changes": "Annuler les Modifications",
 		"displayable": "Affichable:",
 		"DisplayableType.admin": "admin\u{26A1}",
@@ -693,7 +703,7 @@ const LocaleTranslationData = {
 		"edit.a.meter": "Modifier le Métre",
 		"edit.group": "Modifier Groupe",
 		"edit.meter": "Details/Modifier Métre\u{26A1}",
-		"edit.unit": "Edit Unit\u{26A1}",
+		"edit.unit": "Details/Edit Unit\u{26A1}",
 		"edit.user": "Modifier l'utilisateur",
 		"edited": "édité",
 		"enable": "Activer",
@@ -874,6 +884,7 @@ const LocaleTranslationData = {
 		"map.upload.new.file": "Refaire",
 		"maps": "Plans",
 		"max": "max\u{26A1}",
+		"max.value": "Maximum Reading Value Check\u{26A1}",
 		"menu": "Menu",
 		"meter": "Mèter",
 		"meter.create": "Create a Meter\u{26A1}",
@@ -920,6 +931,7 @@ const LocaleTranslationData = {
 		"meter.url": "URL",
 		"meters": "Mèters",
 		"min": "min\u{26A1}",
+		"min.value": "Minimum Reading Value Check\u{26A1}",
 		"minute": "Minute\u{26A1}",
 		"more.energy": "plus d'énergie",
 		"more.options": "More Options\u{26A1}",
@@ -1212,7 +1224,6 @@ const LocaleTranslationData = {
 		"default.meter.minimum.value": "Revisión del valor de lectura mínima del medidor predeterminado",
 		"default.meter.reading.frequency": "Frecuencia de lectura del medidor predeterminada",
 		"default.meter.reading.gap": "Deistancia predeterminada entre lecturas del medidor",
-		"default.site.title": "Título predeterminado de la página ",
 		"default.time.zone": "Zona de horario predeterminada",
 		"default.warning.file.size": "Advertencia predeterminada de tamaño del archivo",
 		"defaultGraphicUnit": "Unidad del gráfico predeterminada:",
@@ -1222,6 +1233,10 @@ const LocaleTranslationData = {
 		"delete.user": "Borrar usario",
 		"descending": "Descendente",
 		"disable": "Desactivar",
+		"disable.checks": "Disable Checks\u{26A1}",
+		"DisableChecksType.reject_all": "No, reject all readings in batch\u{26A1}",
+		"DisableChecksType.reject_bad": "No, only reject the bad reading(s)\u{26A1}",
+		"DisableChecksType.reject_none": "Yes, do not check values\u{26A1}",
 		"discard.changes": "Descartar los cambios",
 		"displayable": "Visualizable:",
 		"DisplayableType.admin": "administrador",
@@ -1232,7 +1247,7 @@ const LocaleTranslationData = {
 		"edit.a.meter": "Editar un medidor",
 		"edit.group": "Editar grupo",
 		"edit.meter": "Details/Editar medidor\u{26A1}",
-		"edit.unit": "Editar unidad",
+		"edit.unit": "Details/Edit Unit\u{26A1}",
 		"edit.user": "Editar Usuario",
 		"edited": "editado",
 		"enable": "Activar",
@@ -1413,6 +1428,7 @@ const LocaleTranslationData = {
 		"map.upload.new.file": "Rehacer",
 		"maps": "Mapas",
 		"max": "máximo",
+		"max.value": "Revisión del valor máximo de lectura",
 		"menu": "Menú",
 		"meter": "Medidor",
 		"meter.create": "Crear un medidor",
@@ -1459,6 +1475,7 @@ const LocaleTranslationData = {
 		"meter.url": "URL:",
 		"meters": "Medidores",
 		"min": "mínimo",
+		"min.value": "Revisión del valor mínimo de lectura",
 		"minute": "Minuto",
 		"more.energy": "más energía",
 		"more.options": "More Options\u{26A1}",
diff --git a/src/client/app/types/items.ts b/src/client/app/types/items.ts
index 7c0907b84..ec549afd0 100644
--- a/src/client/app/types/items.ts
+++ b/src/client/app/types/items.ts
@@ -57,13 +57,10 @@ export interface PreferenceRequestItem {
 	defaultAreaNormalization: boolean;
 	defaultAreaUnit: AreaUnitType;
 	defaultMeterReadingFrequency: string;
-	defaultMeterMinimumValue: number;
-	defaultMeterMaximumValue: number;
 	defaultMeterMinimumDate: string;
 	defaultMeterMaximumDate: string;
 	defaultMeterReadingGap: number;
 	defaultMeterMaximumErrors: number;
-	defaultMeterDisableChecks: boolean;
 	defaultHelpUrl: string;
 }
 
diff --git a/src/client/app/types/redux/admin.ts b/src/client/app/types/redux/admin.ts
index 989d3f29f..e509989b6 100644
--- a/src/client/app/types/redux/admin.ts
+++ b/src/client/app/types/redux/admin.ts
@@ -21,12 +21,9 @@ export interface AdminState {
 	defaultAreaNormalization: boolean;
 	defaultAreaUnit: AreaUnitType;
 	defaultMeterReadingFrequency: string;
-	defaultMeterMinimumValue: number;
-	defaultMeterMaximumValue: number;
 	defaultMeterMinimumDate: string;
 	defaultMeterMaximumDate: string;
 	defaultMeterReadingGap: number;
 	defaultMeterMaximumErrors: number;
-	defaultMeterDisableChecks: boolean;
 	defaultHelpUrl: string;
 }
diff --git a/src/client/app/types/redux/meters.ts b/src/client/app/types/redux/meters.ts
index d5490568e..fa3bd6a84 100644
--- a/src/client/app/types/redux/meters.ts
+++ b/src/client/app/types/redux/meters.ts
@@ -4,6 +4,7 @@
 import { GPSPoint } from 'utils/calibration';
 // import { ActionType } from './actions';
 import { AreaUnitType } from 'utils/getAreaUnitConversion';
+import { DisableChecksType } from './units';
 
 // The relates to the JS object Meter.types for the same use in src/server/models/Meter.js.
 // They should be kept in sync.
@@ -56,7 +57,7 @@ export interface MeterData {
 	minDate: string;
 	maxDate: string;
 	maxError: number;
-	disableChecks: boolean;
+	disableChecks: DisableChecksType;
 }
 
 export interface MeterDataByID extends Record<number, MeterData> { }
diff --git a/src/client/app/types/redux/units.ts b/src/client/app/types/redux/units.ts
index 47c31fb9f..264e68818 100644
--- a/src/client/app/types/redux/units.ts
+++ b/src/client/app/types/redux/units.ts
@@ -20,30 +20,26 @@ export enum UnitRepresentType {
 	raw = 'raw'
 }
 
-export interface UnitData {
-	id: number;
-	name: string;
-	identifier: string;
-	unitRepresent: UnitRepresentType;
-	secInRate: number;
-	typeOfUnit: UnitType;
-	suffix: string;
-	displayable: DisplayableType;
-	preferredDisplay: boolean;
-	note: string;
+export enum DisableChecksType {
+	reject_bad = 'reject_bad',
+	reject_all = 'reject_all',
+	reject_none = 'reject_none'
 }
 
-export interface UnitEditData {
+export interface UnitData {
 	id: number;
 	name: string;
 	identifier: string;
-	unitRepresent: string;
+	unitRepresent: UnitRepresentType;
 	secInRate: number;
 	typeOfUnit: UnitType;
 	suffix: string;
 	displayable: DisplayableType;
 	preferredDisplay: boolean;
 	note: string;
+	maxVal: number;
+	minVal: number;
+	disableChecks: DisableChecksType;
 }
 
 export interface UnitDataById extends Record<number, UnitData> { }
diff --git a/src/client/app/utils/input.ts b/src/client/app/utils/input.ts
index cbdeb7074..602bc98bf 100644
--- a/src/client/app/utils/input.ts
+++ b/src/client/app/utils/input.ts
@@ -3,9 +3,10 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import { GPSPoint } from './calibration';
-import { UnitData, DisplayableType, UnitRepresentType, UnitType, UnitDataById } from '../types/redux/units';
+import { UnitData, DisplayableType, UnitRepresentType, UnitType, UnitDataById, DisableChecksType } from '../types/redux/units';
 import translate from './translate';
 import { LanguageTypes } from 'types/redux/i18n';
+import { MAX_VAL, MIN_VAL } from '../redux/selectors/adminSelectors';
 /**
  * get string value from GPSPoint or null.
  * @param gps GPS point to get value from and can be null
@@ -82,7 +83,10 @@ export const NoUnit: UnitData = {
 	suffix: '',
 	displayable: DisplayableType.none,
 	preferredDisplay: false,
-	note: ''
+	note: '',
+	minVal: MIN_VAL,
+	maxVal: MAX_VAL,
+	disableChecks: DisableChecksType.reject_all
 };
 
 /**
diff --git a/src/server/migrations/1.0.0-2.0.0/index.js b/src/server/migrations/1.0.0-2.0.0/index.js
index 8444613e3..a5768af99 100644
--- a/src/server/migrations/1.0.0-2.0.0/index.js
+++ b/src/server/migrations/1.0.0-2.0.0/index.js
@@ -20,5 +20,9 @@ module.exports = {
         // It should not matter but first rename cik and then do units.
         await db.none(sqlFile('../migrations/1.0.0-2.0.0/sql/cik/alter_cik_table.sql'));
         await db.none(sqlFile('../migrations/1.0.0-2.0.0/sql/units/alter_units_table.sql'));
+        await db.none(sqlFile('../migrations/1.0.0-2.0.0/sql/units/add_disable_checks_types.sql'));
+        await db.none(sqlFile('../migrations/1.0.0-2.0.0/sql/units/alter_units_table_add_columns.sql'));
+        await db.none(sqlFile('../migrations/1.0.0-2.0.0/sql/meter/alter_meter_disable_checks.sql'));
+        await db.none(sqlFile('../migrations/1.0.0-2.0.0/sql/preferences/alter_preferences_table.sql'));
     }
 };
diff --git a/src/server/migrations/1.0.0-2.0.0/sql/meter/add_meter_pipeline_checks.sql b/src/server/migrations/1.0.0-2.0.0/sql/meter/add_meter_pipeline_checks.sql
index e511a2c26..4ad0ba842 100644
--- a/src/server/migrations/1.0.0-2.0.0/sql/meter/add_meter_pipeline_checks.sql
+++ b/src/server/migrations/1.0.0-2.0.0/sql/meter/add_meter_pipeline_checks.sql
@@ -4,8 +4,8 @@
 
 -- Add meter pipeline check columns to the meters table.
 ALTER TABLE meters
-    ADD COLUMN IF NOT EXISTS min_val FLOAT NOT NULL DEFAULT -9007199254740991 CHECK (min_val::FLOAT >= -9007199254740991),
-    ADD COLUMN IF NOT EXISTS max_val FLOAT NOT NULL DEFAULT 9007199254740991 CHECK (max_val::FLOAT <= 9007199254740991),
+    ADD COLUMN IF NOT EXISTS min_val FLOAT NOT NULL DEFAULT -9007199254740991,
+    ADD COLUMN IF NOT EXISTS max_val FLOAT NOT NULL DEFAULT 9007199254740991 CHECK (max_val >= min_val),
     ADD COLUMN IF NOT EXISTS min_date TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00+00:00',
     ADD COLUMN IF NOT EXISTS max_date TIMESTAMP NOT NULL DEFAULT '6970-01-01 00:00:00+00:00',
     ADD COLUMN IF NOT EXISTS max_error INTEGER NOT NULL DEFAULT 75,
diff --git a/src/server/migrations/1.0.0-2.0.0/sql/meter/alter_meter_disable_checks.sql b/src/server/migrations/1.0.0-2.0.0/sql/meter/alter_meter_disable_checks.sql
new file mode 100644
index 000000000..11e537b09
--- /dev/null
+++ b/src/server/migrations/1.0.0-2.0.0/sql/meter/alter_meter_disable_checks.sql
@@ -0,0 +1,24 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+-- Add a temporary column with the new type
+ALTER TABLE meters 
+    ADD COLUMN disable_checks_temp disable_checks_type NOT NULL DEFAULT 'reject_all';
+
+-- Update the temporary column based on the current boolean values in disable_checks
+UPDATE meters
+SET disable_checks_temp = 
+    CASE 
+        WHEN disable_checks = true THEN 'reject_none'::disable_checks_type
+        WHEN disable_checks = false THEN 'reject_all'::disable_checks_type
+    END;
+
+-- Drop the old column
+ALTER TABLE meters 
+    DROP COLUMN disable_checks;
+
+-- Rename the temporary column to the original column name
+ALTER TABLE meters 
+    RENAME COLUMN disable_checks_temp TO disable_checks;
+
diff --git a/src/server/migrations/1.0.0-2.0.0/sql/preferences/add_preferences_pipeline_checks.sql b/src/server/migrations/1.0.0-2.0.0/sql/preferences/add_preferences_pipeline_checks.sql
index 617934da0..da85dbd4d 100644
--- a/src/server/migrations/1.0.0-2.0.0/sql/preferences/add_preferences_pipeline_checks.sql
+++ b/src/server/migrations/1.0.0-2.0.0/sql/preferences/add_preferences_pipeline_checks.sql
@@ -1,4 +1,4 @@
-* This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
@@ -6,21 +6,15 @@
 
 -- You need to set default so any existing rows get that value since NOT NULL.
 ALTER TABLE preferences
-    ADD COLUMN IF NOT EXISTS default_meter_minimum_value FLOAT NOT NULL DEFAULT -9007199254740991,
-	ADD COLUMN IF NOT EXISTS default_meter_maximum_value FLOAT NOT NULL DEFAULT 9007199254740991,
 	ADD COLUMN IF NOT EXISTS default_meter_minimum_date TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00+00:00',
     ADD COLUMN IF NOT EXISTS default_meter_maximum_date TIMESTAMP NOT NULL DEFAULT '6970-01-01 00:00:00+00:00',
 	ADD COLUMN IF NOT EXISTS default_meter_reading_gap REAL NOT NULL DEFAULT 0,
     ADD COLUMN IF NOT EXISTS default_meter_maximum_errors INTEGER NOT NULL DEFAULT 75,
-	ADD COLUMN IF NOT EXISTS default_meter_disable_checks BOOLEAN NOT NULL DEFAULT false
 ;
 -- Now remove default since not desired.
 ALTER TABLE preferences
-    ALTER COLUMN default_meter_minimum_value DROP DEFAULT,
-	ALTER COLUMN default_meter_maximum_value DROP DEFAULT,
 	ALTER COLUMN default_meter_minimum_date DROP DEFAULT,
     ALTER COLUMN default_meter_maximum_date DROP DEFAULT,
 	ALTER COLUMN default_meter_reading_gap DROP DEFAULT,
     ALTER COLUMN default_meter_maximum_errors DROP DEFAULT,
-    ALTER COLUMN default_meter_disable_checks DROP DEFAULT
 ;
diff --git a/src/server/migrations/1.0.0-2.0.0/sql/preferences/alter_preferences_table.sql b/src/server/migrations/1.0.0-2.0.0/sql/preferences/alter_preferences_table.sql
new file mode 100644
index 000000000..492c2f9f4
--- /dev/null
+++ b/src/server/migrations/1.0.0-2.0.0/sql/preferences/alter_preferences_table.sql
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ALTER TABLE units
+    DROP COLUMN IF EXISTS default_meter_minimum_value,
+    DROP COLUMN IF EXISTS default_meter_maximum_value
+;
diff --git a/src/server/migrations/1.0.0-2.0.0/sql/units/add_disable_checks_types.sql b/src/server/migrations/1.0.0-2.0.0/sql/units/add_disable_checks_types.sql
new file mode 100644
index 000000000..139f4ee3f
--- /dev/null
+++ b/src/server/migrations/1.0.0-2.0.0/sql/units/add_disable_checks_types.sql
@@ -0,0 +1,10 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+DO $$ BEGIN 
+	CREATE TYPE disable_checks_type AS ENUM('reject_bad', 'reject_all', 'reject_none');
+EXCEPTION
+	WHEN duplicate_object THEN null;
+END $$;
diff --git a/src/server/migrations/1.0.0-2.0.0/sql/units/alter_units_table_add_columns.sql b/src/server/migrations/1.0.0-2.0.0/sql/units/alter_units_table_add_columns.sql
new file mode 100644
index 000000000..8a4da13b4
--- /dev/null
+++ b/src/server/migrations/1.0.0-2.0.0/sql/units/alter_units_table_add_columns.sql
@@ -0,0 +1,9 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ALTER TABLE units
+    ADD COLUMN IF NOT EXISTS min_val FLOAT NOT NULL DEFAULT -9007199254740991,
+    ADD COLUMN IF NOT EXISTS max_val FLOAT NOT NULL DEFAULT 9007199254740991 CHECK (max_val >= min_val),
+    ADD COLUMN IF NOT EXISTS disable_checks disable_checks_type NOT NULL DEFAULT 'reject_all'
+;
diff --git a/src/server/models/Meter.js b/src/server/models/Meter.js
index a8a7dcd36..b6ab135cc 100644
--- a/src/server/models/Meter.js
+++ b/src/server/models/Meter.js
@@ -60,7 +60,7 @@ class Meter {
 		reading = 0.0, startTimestamp = moment(0).utc().format('YYYY-MM-DD HH:mm:ssZ'), endTimestamp = moment(0).utc().format('YYYY-MM-DD HH:mm:ssZ'),
 		previousEnd = moment(0).utc(), unitId = -99, defaultGraphicUnit = -99, areaUnit = Unit.areaUnitType.NONE, readingFrequency = '00:15:00',
 		minVal = Number.MIN_SAFE_INTEGER, maxVal = Number.MAX_SAFE_INTEGER, minDate = moment(0).utc().format('YYYY-MM-DD HH:mm:ssZ'),
-		maxDate = moment(0).utc().add(5000, 'years').format('YYYY-MM-DD HH:mm:ssZ'), maxError = 75, disableChecks = false) {
+		maxDate = moment(0).utc().add(5000, 'years').format('YYYY-MM-DD HH:mm:ssZ'), maxError = 75, disableChecks = Meter.disableChecksType.REJECT_ALL) {
 		// In order for the CSV pipeline to work, the order of the parameters needs to match the order that the fields are declared.
 		// In addition, each new parameter has to be added at the very end.
 		this.id = id;
@@ -313,6 +313,14 @@ class Meter {
 		return Reading.getAllByMeterID(this.id, conn);
 	}
 
+	/**
+	 * Returns a promise to create the disableChecksType enum of reject_bad, reject_all, and reject_none.
+	 * @param {*} conn The connection to use.
+	 * @returns {Promise.<>}
+	 */
+	static createDisableChecksTypesEnum(conn) {
+		return conn.none(sqlFile('unit/create_disable_checks_types_enum.sql'));
+	}
 	/**
 	 * Makes the given meter valid.
 	 * @param {*} meter The meter.
@@ -348,6 +356,12 @@ class Meter {
 	}
 }
 
+Meter.disableChecksType = Object.freeze({
+	REJECT_BAD: 'reject_bad',
+	REJECT_ALL: 'reject_all',
+	REJECT_NONE: 'reject_none'
+});
+
 // The relates to the TS object MeterType for the same use in src/client/app/types/redux/meters.ts.
 // They should be kept in sync.
 // Enum of meter types
diff --git a/src/server/models/Preferences.js b/src/server/models/Preferences.js
index 8e534f066..3056fa9b8 100644
--- a/src/server/models/Preferences.js
+++ b/src/server/models/Preferences.js
@@ -19,19 +19,16 @@ class Preferences {
 	 * @param {Number} defaultAreaNormalization - Option to set the default toggle of area normalization
 	 * @param {String} defaultAreaUnit - The default area unit to normalize by
 	 * @param {String} defaultMeterReadingFrequency - The default meter reading frequency if none is given
-	 * @param {Number} defaultMeterMinimumValue - Option to set the default meter minimum value
-	 * @param {Number} defaultMeterMaximumValue - Option to set the default meter maximum value
 	 * @param {String} defaultMeterMinimumDate - Option to set the default meter minimum date
-	 * @param {String} defaultMeterMaximumValue - Option to set the default meter maximum value
+	 * @param {String} defaultMeterMaximumDate - Option to set the default meter maximum date
 	 * @param {Number} defaultMeterReadingGap - Option to set the default meter reading gap
 	 * @param {Number} defaultMeterMaximumErrors - Option to set the default meter maximum number of errors
-	 * @param {Boolean} defaultMeterDisableChecks - Option to set the default meter disable checks
 	 * @param {String} defaultHelpUrl - Option to set the default help page url
 	*/
 	constructor(displayTitle, defaultChartToRender, defaultBarStacking, defaultLanguage, defaultTimezone,
 		defaultWarningFileSize, defaultFileSizeLimit, defaultAreaNormalization, defaultAreaUnit, defaultMeterReadingFrequency,
-		defaultMeterMinimumValue, defaultMeterMaximumValue, defaultMeterMinimumDate,
-		defaultMeterMaximumDate, defaultMeterReadingGap, defaultMeterMaximumErrors, defaultMeterDisableChecks, defaultHelpUrl) {
+		defaultMeterMinimumDate,
+		defaultMeterMaximumDate, defaultMeterReadingGap, defaultMeterMaximumErrors, defaultHelpUrl) {
 		this.displayTitle = displayTitle;
 		this.defaultChartToRender = defaultChartToRender;
 		this.defaultBarStacking = defaultBarStacking;
@@ -42,13 +39,10 @@ class Preferences {
 		this.defaultAreaNormalization = defaultAreaNormalization;
 		this.defaultAreaUnit = defaultAreaUnit;
 		this.defaultMeterReadingFrequency = defaultMeterReadingFrequency;
-		this.defaultMeterMinimumValue = defaultMeterMinimumValue;
-		this.defaultMeterMaximumValue = defaultMeterMaximumValue;
 		this.defaultMeterMinimumDate = defaultMeterMinimumDate;
 		this.defaultMeterMaximumDate = defaultMeterMaximumDate;
 		this.defaultMeterReadingGap = defaultMeterReadingGap;
 		this.defaultMeterMaximumErrors = defaultMeterMaximumErrors;
-		this.defaultMeterDisableChecks = defaultMeterDisableChecks;
 		this.defaultHelpUrl = defaultHelpUrl;
 	}
 
@@ -82,13 +76,10 @@ class Preferences {
 			row.default_area_normalization,
 			row.default_area_unit,
 			row.default_meter_reading_frequency,
-			row.default_meter_minimum_value,
-			row.default_meter_maximum_value,
 			row.default_meter_minimum_date,
 			row.default_meter_maximum_date,
 			row.default_meter_reading_gap,
 			row.default_meter_maximum_errors,
-			row.default_meter_disable_checks,
 			row.default_help_url
 		);
 	}
@@ -122,13 +113,10 @@ class Preferences {
 				defaultAreaNormalization: preferences.defaultAreaNormalization,
 				defaultAreaUnit: preferences.defaultAreaUnit,
 				defaultMeterReadingFrequency: preferences.defaultMeterReadingFrequency,
-				defaultMeterMinimumValue: preferences.defaultMeterMinimumValue,
-				defaultMeterMaximumValue: preferences.defaultMeterMaximumValue,
 				defaultMeterMinimumDate: preferences.defaultMeterMinimumDate,
 				defaultMeterMaximumDate: preferences.defaultMeterMaximumDate,
 				defaultMeterReadingGap: preferences.defaultMeterReadingGap,
 				defaultMeterMaximumErrors: preferences.defaultMeterMaximumErrors,
-				defaultMeterDisableChecks: preferences.defaultMeterDisableChecks,
 				defaultHelpUrl: preferences.defaultHelpUrl
 			});
 		// Postgres interprets the defaultMeterReadingFrequency and it might not be what was
diff --git a/src/server/models/Unit.js b/src/server/models/Unit.js
index b3271da45..30a9d45a4 100644
--- a/src/server/models/Unit.js
+++ b/src/server/models/Unit.js
@@ -18,8 +18,11 @@ class Unit {
 	 * @param {*} displayable Can be none, all, or admin. Restrict the type of user that can see this unit.
 	 * @param {*} preferredDisplay True if this unit is always displayed. If not, the user needs to ask to see (for future enhancement).
 	 * @param {*} note Note about this unit.
+	 * @param minVal inclusive minimum acceptable reading value (won't be rejected)
+	 * @param maxVal inclusive maximum acceptable reading value (won't be rejected)
+	 * @param disableChecks disable checks on meter for conditionSet (three possible values)
 	 */
-	constructor(id, name, identifier = name, unitRepresent, secInRate = 3600, typeOfUnit, suffix = '', displayable, preferredDisplay, note) {
+	constructor(id, name, identifier = name, unitRepresent, secInRate = 3600, typeOfUnit, suffix = '', displayable, preferredDisplay, note, minVal = Number.MIN_SAFE_INTEGER, maxVal = Number.MAX_SAFE_INTEGER, disableChecks = Unit.disableChecksType.REJECT_ALL) {
 		this.id = id;
 		this.name = name;
 		this.identifier = identifier;
@@ -30,6 +33,9 @@ class Unit {
 		this.displayable = displayable;
 		this.preferredDisplay = preferredDisplay;
 		this.note = note;
+		this.minVal = minVal;
+		this.maxVal = maxVal;
+		this.disableChecks = disableChecks;
 	}
 
 	/**
@@ -39,7 +45,7 @@ class Unit {
 	 */
 	static mapRow(row) {
 		return new Unit(row.id, row.name, row.identifier, row.unit_represent, row.sec_in_rate,
-			row.type_of_unit, row.suffix, row.displayable, row.preferred_display, row.note);
+			row.type_of_unit, row.suffix, row.displayable, row.preferred_display, row.note, row.min_val, row.max_val, row.disable_checks);
 	}
 
 	/**
@@ -78,6 +84,15 @@ class Unit {
 		return conn.none(sqlFile('unit/create_displayable_types_enum.sql'));
 	}
 
+	/**
+	 * Returns a promise to create the disableChecksType enum of reject_bad, reject_all, and reject_none.
+	 * @param {*} conn The connection to use.
+	 * @returns {Promise.<>}
+	 */
+	static createDisableChecksTypesEnum(conn) {
+		return conn.none(sqlFile('unit/create_disable_checks_types_enum.sql'));
+	}
+
 	/**
 	 * Returns a promise to create the unitRepresentType enum of quantity, flow and raw.
 	 * @param {*} conn The connection to use.
@@ -241,6 +256,12 @@ Unit.displayableType = Object.freeze({
 	ADMIN: 'admin'
 });
 
+Unit.disableChecksType = Object.freeze({
+	REJECT_BAD: 'reject_bad',
+	REJECT_ALL: 'reject_all',
+	REJECT_NONE: 'reject_none'
+});
+
 Unit.unitRepresentType = Object.freeze({
 	QUANTITY: 'quantity',
 	FLOW: 'flow',
diff --git a/src/server/models/database.js b/src/server/models/database.js
index 8bb3f3ebc..e39c6167e 100644
--- a/src/server/models/database.js
+++ b/src/server/models/database.js
@@ -90,11 +90,13 @@ async function createSchema(conn) {
 	await Unit.createUnitTypesEnum(conn);
 	await Unit.createAreaUnitTypesEnum(conn);
 	await Unit.createDisplayableTypesEnum(conn);
+	await Unit.createDisableChecksTypesEnum(conn);
 	await Unit.createUnitRepresentTypesEnum(conn);
 	await Unit.createTable(conn);
 	await Conversion.createTable(conn);
 	await Cik.createTable(conn);
 	await Meter.createMeterTypesEnum(conn);
+	await Meter.createDisableChecksTypesEnum(conn);
 	// This sql code creates a function to check meter's timezone.
 	// It needs to be called before meter table is created.
 	await conn.none(sqlFile('meter/check_timezone.sql'));
diff --git a/src/server/routes/meters.js b/src/server/routes/meters.js
index 5bd411ca5..bfdcc0102 100644
--- a/src/server/routes/meters.js
+++ b/src/server/routes/meters.js
@@ -246,7 +246,11 @@ function validateMeterParams(params) {
 			minDate: { type: 'string' },
 			maxDate: { type: 'string' },
 			maxError: { type: 'integer' },
-			disableChecks: { type: 'bool' },
+			disableChecks: {
+				type: 'string',
+				minLength: 1,
+				enum: Object.values(Meter.disableChecksType)
+			}
 		}
 	}
 	const paramsValidationResult = validate(params, validParams);
diff --git a/src/server/routes/preferences.js b/src/server/routes/preferences.js
index 69553da17..d4dfcf890 100644
--- a/src/server/routes/preferences.js
+++ b/src/server/routes/preferences.js
@@ -5,6 +5,7 @@
 const express = require('express');
 const Preferences = require('../models/Preferences');
 const { log } = require('../log');
+const Meter = require('../models/Meter');
 const adminAuthenticator = require('./authenticator').adminAuthMiddleware;
 const validate = require('jsonschema').validate;
 const { getConnection } = require('../db');
@@ -67,12 +68,6 @@ router.post('/', async (req, res) => {
 				defaultMeterReadingFrequency: {
 					type: 'string'
 				},
-				defaultMeterMinimumValue: {
-					type: 'number'
-				},
-				defaultMeterMaximumValue: {
-					type: 'number'
-				},
 				defaultMeterMinimumDate: {
 					type: 'string'
 				},
@@ -85,9 +80,6 @@ router.post('/', async (req, res) => {
 				defaultMeterMaximumErrors: {
 					type: 'number'
 				},
-				defaultMeterDisableChecks: {
-					type: 'boolean'
-				},
 				defaultHelpUrl: {
 					type: 'string'
 				}
diff --git a/src/server/routes/units.js b/src/server/routes/units.js
index b5e9c6392..39a883d74 100644
--- a/src/server/routes/units.js
+++ b/src/server/routes/units.js
@@ -16,7 +16,7 @@ function formatUnitForResponse(item) {
 	return {
 		id: item.id, name: item.name, identifier: item.identifier, unitRepresent: item.unitRepresent,
 		secInRate: item.secInRate, typeOfUnit: item.typeOfUnit, suffix: item.suffix,
-		displayable: item.displayable, preferredDisplay: item.preferredDisplay, note: item.note
+		displayable: item.displayable, preferredDisplay: item.preferredDisplay, note: item.note, minVal: item.minVal, maxVal: item.maxVal, disableChecks: item.disableChecks
 	};
 }
 
@@ -77,10 +77,20 @@ router.post('/edit', async (req, res) => {
 			},
 			note: {
 				type: 'string'
+			},
+			minVal: {
+				type: 'number',
+			},
+			maxVal: {
+				type: 'number',
+			},
+			disableChecks: {
+				type: 'string',
+				minLength: 1,
+				enum: Object.values(Unit.disableChecksType)
 			}
 		}
 	};
-
 	const validatorResult = validate(req.body, validUnit);
 	if (!validatorResult.valid) {
 		log.warn(`Got request to edit units with invalid unit data, errors:${validatorResult.errors}`);
@@ -102,6 +112,9 @@ router.post('/edit', async (req, res) => {
 			unit.secInRate = req.body.secInRate;
 			unit.suffix = req.body.suffix;
 			unit.note = req.body.note;
+			unit.minVal = req.body.minVal;
+			unit.maxVal = req.body.maxVal;
+			unit.disableChecks = req.body.disableChecks;
 			await unit.update(conn);
 		} catch (err) {
 			log.error('Failed to edit unit', err);
@@ -117,7 +130,7 @@ router.post('/edit', async (req, res) => {
 router.post('/addUnit', async (req, res) => {
 	const validUnit = {
 		type: 'object',
-		required: ['name', 'identifier', 'unitRepresent', 'typeOfUnit', 'displayable', 'preferredDisplay'],
+		required: ['name', 'identifier', 'unitRepresent', 'typeOfUnit', 'displayable', 'preferredDisplay', 'minVal', 'maxVal', 'disableChecks'],
 		properties: {
 			// Removed id from properties list since it is set to undefined no matter what is passed.
 			name: {
@@ -160,6 +173,17 @@ router.post('/addUnit', async (req, res) => {
 					{ type: 'string' },
 					{ type: 'null' }
 				]
+			},
+			minVal: {
+				type: 'number'
+			},
+			maxVal: {
+				type: 'number'
+			},
+			disableChecks: {
+				type: 'string',
+				minLength: 1,
+				enum: Object.values(Unit.disableChecksType)
 			}
 		}
 	};
@@ -181,7 +205,10 @@ router.post('/addUnit', async (req, res) => {
 					req.body.suffix,
 					req.body.displayable,
 					req.body.preferredDisplay,
-					req.body.note
+					req.body.note,
+					req.body.minVal,
+					req.body.maxVal,
+					req.body.disableChecks
 				);
 				await newUnit.insert(t);
 			});
diff --git a/src/server/services/obvius/loadLogfileToReadings.js b/src/server/services/obvius/loadLogfileToReadings.js
index 3c2766327..f8b8d7b91 100644
--- a/src/server/services/obvius/loadLogfileToReadings.js
+++ b/src/server/services/obvius/loadLogfileToReadings.js
@@ -55,12 +55,12 @@ async function loadLogfileToReadings(serialNumber, ipAddress, logfile, conn) {
 				undefined, // default graphic unit
 				undefined, // area unit
 				preferences.defaultMeterReadingFrequency, // reading frequency
-				preferences.defaultMeterMinimumValue, // minVal
-				preferences.defaultMeterMaximumValue, // maxVal
+				Number.MIN_SAFE_INTEGER, // minVal
+				Number.MAX_SAFE_INTEGER, // maxVal
 				preferences.defaultMeterMinimumDate, // minDate
 				preferences.defaultMeterMaximumDate, // maxDate
 				preferences.defaultMeterMaximumErrors, // maxError
-				preferences.defaultMeterDisableChecks  // disableChecks
+				Meter.disableChecksType.REJECT_ALL // disable checks
 			);
 			await meter.insert(conn);
 			log.warn('WARNING: Created a meter (' + `${serialNumber}.${i}` +
@@ -113,13 +113,10 @@ async function loadLogfileToReadings(serialNumber, ipAddress, logfile, conn) {
 				// Unsure if previous values should not change but going to assume want the latest one sent.
 				shouldUpdate = true,
 				conditionSet = {
-					minVal: meter.minVal,
-					maxVal: meter.maxVal,
 					minDate: meter.minDate,
 					maxDate: meter.maxDate,
 					threshold: readingGap,
-					maxError: meter.maxError,
-					disableChecks: meter.disableChecks
+					maxError: meter.maxError
 				},
 				conn = conn,
 				honorDst = false,
diff --git a/src/server/services/pipeline-in-progress/processData.js b/src/server/services/pipeline-in-progress/processData.js
index f458e1d3c..53b318766 100644
--- a/src/server/services/pipeline-in-progress/processData.js
+++ b/src/server/services/pipeline-in-progress/processData.js
@@ -9,7 +9,7 @@ const { log } = require('../../log');
 const Meter = require('../../models/Meter');
 const Reading = require('../../models/Reading');
 const handleCumulativeReset = require('./handleCumulativeReset');
-const { validateReadings } = require('./validateReadings');
+const { validateReadings, validateSingleReading } = require('./validateReadings');
 const { MeterTimeSortTypesJS } = require('../csvPipeline/validateCsvUploadParams');
 const { meterTimezone } = require('../meterTimezone');
 
@@ -659,18 +659,28 @@ async function processData(rows, meterID, timeSort = MeterTimeSortTypesJS.increa
 		// Not used in many cases but just set since easier.
 		prevEndTimestampTz = endTimestampTz;
 	}
-	// Validate data if conditions given
-	if (conditionSet !== undefined && !conditionSet['disableChecks']) {
+	// Validate data if conditions are given and disableChecks is not set to 'reject_none'
+	if (conditionSet !== undefined && conditionSet['disableChecks'] !== 'reject_none') {
 		const { validReadings, errMsg: newErrMsg } = validateReadings(result, conditionSet, meterName);
 		({ msgTotal, msgTotalWarning } = appendMsgTotal(msgTotal, newErrMsg, msgTotalWarning));
+
 		if (!validReadings) {
-			errMsg = `<h2>For meter ${meterName}: error when validating data so all reading are rejected</h2>`;
+			errMsg = `<h2>For meter ${meterName}: error when validating data so all readings are rejected</h2>`;
 			log.error(errMsg);
 			({ msgTotal, msgTotalWarning } = appendMsgTotal(msgTotal, errMsg, msgTotalWarning));
-			// This empties the result array. Should be fast and okay with const.
-			result.splice(0, result.length);
+
+			// Handle 'reject_bad' specifically
+			if (conditionSet['disableChecks'] === 'reject_bad') {
+				// This removes invalid readings but keeps the valid ones.
+				result = result.filter(reading => validateSingleReading(reading, conditionSet));
+			} else {
+				// Default behavior: reject all readings
+				// Empties the result array
+				result.splice(0, result.length);
+			}
+
+			// Mark readings as not okay since some were dropped
 			isAllReadingsOk = false;
-			return { result, isAllReadingsOk, msgTotal };
 		}
 	}
 	// Update the meter to contain information for the last reading in the data file.
diff --git a/src/server/services/pipeline-in-progress/validateReadings.js b/src/server/services/pipeline-in-progress/validateReadings.js
index 7e9affa49..d6d659dc6 100644
--- a/src/server/services/pipeline-in-progress/validateReadings.js
+++ b/src/server/services/pipeline-in-progress/validateReadings.js
@@ -15,12 +15,38 @@ const { log } = require('../../log');
  */
 function validateReadings(arrayToValidate, conditionSet, meterIdentifier = undefined) {
 	/* tslint:disable:no-string-literal */
-	const { validDates, errMsg: errMsgDate } = checkDate(arrayToValidate, conditionSet['minDate'], conditionSet['maxDate'], conditionSet['maxError'] / 2, meterIdentifier);
-	const { validValues, errMsg: errMsgValue } = checkValue(arrayToValidate, conditionSet['minVal'], conditionSet['maxVal'], conditionSet['maxError'] / 2, meterIdentifier);
+	const { validDates, rejectedDates, errMsg: errMsgDate } = checkDate(arrayToValidate, conditionSet['minDate'], conditionSet['maxDate'], conditionSet['maxError'] / 2, meterIdentifier);
+	const { validValues, rejectedValues, errMsg: errMsgValue } = checkValue(arrayToValidate, conditionSet['minVal'], conditionSet['maxVal'], conditionSet['maxError'] / 2, meterIdentifier);
 	/* tslint:enable:no-string-literal */
 	const errMsg = errMsgDate + errMsgValue;
+
+    const validReadings = validDates && validValues;
+    let rejectedReadings = [];
+
+	// Even when 'reject_none' is set, issues should still be logged
+    if (conditionSet['disableChecks'] === 'reject_none') {
+        return {
+            validReadings: true,
+            rejectedReadings: [],
+			// Keep the error messages even if no rejections occur
+            errMsg,
+        };
+    } else {
+        if (conditionSet['disableChecks'] === 'reject_bad') {
+            // Remove only invalid readings and return the rejected ones
+            rejectedReadings = [...rejectedDates, ...rejectedValues];
+            arrayToValidate = arrayToValidate.filter(reading => !rejectedReadings.includes(reading));
+        } else if (conditionSet['disableChecks'] === 'reject_all' && !validReadings) {
+            // Reject all readings if validation fails
+            rejectedReadings = [...arrayToValidate];
+			// Clear the array
+			arrayToValidate = arrayToValidate.slice(0, 0);
+        }
+    }
+
 	return {
-		validReadings: validDates && validValues,
+		validReadings,
+        rejectedReadings,
 		errMsg,
 	};
 }
@@ -36,8 +62,9 @@ function validateReadings(arrayToValidate, conditionSet, meterIdentifier = undef
 function checkDate(arrayToValidate, minDate, maxDate, maxError, meterIdentifier) {
 	let validDates = true;
 	let errMsg = '';
+	const rejectedDates = [];
 	if (minDate === null && maxDate === null) {
-		return { validDates, errMsg };
+		return { validDates, rejectedDates, errMsg };
 	}
 	let readingNumber = 0;
 	for (const reading of arrayToValidate) {
@@ -53,18 +80,20 @@ function checkDate(arrayToValidate, minDate, maxDate, maxError, meterIdentifier)
 			errMsg += '<br>' + newErrMsg + '<br>';
 			--maxError;
 			validDates = false;
+			rejectedDates.push(reading);
 		}
 		if (reading.endTimestamp > maxDate) {
 			const newErrMsg = `error when checking reading time for #${readingNumber} on meter ${meterIdentifier}: ` +
-			`time ${reading.endTimestamp} is later than upper bound ${maxDate} ` +
-			`with reading ${reading.reading} and startTimestamp ${reading.startTimestamp}`;
+				`time ${reading.endTimestamp} is later than upper bound ${maxDate} ` +
+				`with reading ${reading.reading} and startTimestamp ${reading.startTimestamp}`;
 			log.error(newErrMsg);
 			errMsg += '<br>' + newErrMsg + '<br>';
 			--maxError;
 			validDates = false;
+			rejectedDates.push(reading);
 		}
 	}
-	return { validDates, errMsg };
+	return { validDates, rejectedDates, errMsg };
 }
 
 /**
@@ -78,6 +107,7 @@ function checkDate(arrayToValidate, minDate, maxDate, maxError, meterIdentifier)
 function checkValue(arrayToValidate, minVal, maxVal, maxError, meterIdentifier) {
 	let validValues = true;
 	let errMsg = '';
+	const rejectedValues = [];
 	let readingNumber = 0;
 	for (const reading of arrayToValidate) {
 		readingNumber++;
@@ -86,23 +116,25 @@ function checkValue(arrayToValidate, minVal, maxVal, maxError, meterIdentifier)
 		}
 		if (reading.reading < minVal) {
 			const newErrMsg = `error when checking reading value for #${readingNumber} on meter ${meterIdentifier}: ` +
-			`value ${reading.reading} is smaller than lower bound ${minVal} ` +
-			`with startTimestamp ${reading.startTimestamp} and endTimestamp ${reading.endTimestamp}`;
+				`value ${reading.reading} is smaller than lower bound ${minVal} ` +
+				`with startTimestamp ${reading.startTimestamp} and endTimestamp ${reading.endTimestamp}`;
 			log.error(newErrMsg);
 			errMsg += '<br>' + newErrMsg + '<br>';
 			--maxError;
 			validValues = false;
+			rejectedValues.push(reading);
 		} else if (reading.reading > maxVal) {
 			const newErrMsg = `error when checking reading value for #${readingNumber} on meter ${meterIdentifier}: ` +
-			`value ${reading.reading} is larger than upper bound ${maxVal} ` +
-			`with startTimestamp ${reading.startTimestamp} and endTimestamp ${reading.endTimestamp}`;
+				`value ${reading.reading} is larger than upper bound ${maxVal} ` +
+				`with startTimestamp ${reading.startTimestamp} and endTimestamp ${reading.endTimestamp}`;
 			log.error(newErrMsg);
 			errMsg += '<br>' + newErrMsg + '<br>';
 			--maxError;
 			validValues = false;
+			rejectedValues.push(reading);
 		}
 	}
-	return { validValues, errMsg };
+	return { validValues, rejectedValues, errMsg };
 }
 
 /**
@@ -146,10 +178,30 @@ function checkIntervals(arrayToValidate, threshold, meterIdentifier) {
 	return { validIntervals, errMsg };
 }
 
+/**
+ * Validate a single reading based on the provided conditionSet.
+ * @param {Reading} reading - The reading object to validate.
+ * @param {Object} conditionSet - The validation conditions including min/max values, dates, and thresholds.
+ * @returns {boolean} - Returns true if the reading is valid, false otherwise.
+ */
+function validateSingleReading(reading, conditionSet) {
+    const { minVal, maxVal, minDate, maxDate } = conditionSet;
+
+    // Check if the reading falls within the acceptable date range
+    if ((minDate && reading.startTimestamp < minDate) || (maxDate && reading.endTimestamp > maxDate)) {
+        return false;
+    }
+    // Check if the reading falls within the acceptable value range
+    if ((minVal !== undefined && reading.reading < minVal) || (maxVal !== undefined && reading.reading > maxVal)) {
+        return false;
+    }
+    return true;
+}
 
 module.exports = {
 	validateReadings,
 	checkDate,
 	checkValue,
-	checkIntervals
+	checkIntervals,
+	validateSingleReading
 };
diff --git a/src/server/services/readMamacMeters.js b/src/server/services/readMamacMeters.js
index b84caad2a..37ec97426 100644
--- a/src/server/services/readMamacMeters.js
+++ b/src/server/services/readMamacMeters.js
@@ -97,12 +97,9 @@ async function getMeterInfo(url, ip, csvLine) {
 				unitId, // default graphic unit
 				undefined, // area unit
 				preferences.defaultMeterReadingFrequency, // reading frequency
-				preferences.defaultMeterMinimumValue, // minVal
-				preferences.defaultMeterMaximumValue, // maxVal
 				preferences.defaultMeterMinimumDate, // minDate
 				preferences.defaultMeterMaximumDate, // maxDate
-				preferences.defaultMeterMaximumErrors, // maxError
-				preferences.defaultMeterDisableChecks  // disableChecks
+				preferences.defaultMeterMaximumErrors // maxError
 			);
 		});
 }
diff --git a/src/server/sql/meter/create_meters_table.sql b/src/server/sql/meter/create_meters_table.sql
index 30722dec3..590a94e14 100644
--- a/src/server/sql/meter/create_meters_table.sql
+++ b/src/server/sql/meter/create_meters_table.sql
@@ -65,10 +65,10 @@ CREATE TABLE IF NOT EXISTS meters (
     default_graphic_unit INTEGER REFERENCES units(id),
     area_unit area_unit_type NOT NULL DEFAULT 'none',
     reading_frequency INTERVAL NOT NULL DEFAULT '00:15:00',
-    min_val FLOAT NOT NULL DEFAULT -9007199254740991 CHECK (min_val::FLOAT >= -9007199254740991),
-    max_val FLOAT NOT NULL DEFAULT 9007199254740991 CHECK (max_val::FLOAT <= 9007199254740991),
+    min_val FLOAT NOT NULL DEFAULT -9007199254740991,
+    max_val FLOAT NOT NULL DEFAULT 9007199254740991 CHECK (max_val >= min_val),
     min_date TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00+00:00',
     max_date TIMESTAMP NOT NULL DEFAULT '6970-01-01 00:00:00+00:00',
     max_error INTEGER NOT NULL DEFAULT 75,
-    disable_checks BOOLEAN DEFAULT false
+    disable_checks disable_checks_type NOT NULL DEFAULT 'reject_all'
 );
diff --git a/src/server/sql/preferences/create_preferences_table.sql b/src/server/sql/preferences/create_preferences_table.sql
index 9b31994ef..e4279785c 100644
--- a/src/server/sql/preferences/create_preferences_table.sql
+++ b/src/server/sql/preferences/create_preferences_table.sql
@@ -15,12 +15,9 @@ CREATE TABLE IF NOT EXISTS preferences (
 	default_area_normalization BOOLEAN NOT NULL,
 	default_area_unit area_unit_type NOT NULL,
 	default_meter_reading_frequency INTERVAL NOT NULL,
-	default_meter_minimum_value FLOAT NOT NULL,
-	default_meter_maximum_value FLOAT NOT NULL,
 	default_meter_minimum_date TIMESTAMP NOT NULL,
     default_meter_maximum_date TIMESTAMP NOT NULL,
 	default_meter_reading_gap REAL NOT NULL,
     default_meter_maximum_errors INTEGER NOT NULL,
-	default_meter_disable_checks BOOLEAN NOT NULL,
 	default_help_url TEXT DEFAULT NULL
 );
diff --git a/src/server/sql/preferences/insert_default_row.sql b/src/server/sql/preferences/insert_default_row.sql
index ab2bd8f04..048f07289 100644
--- a/src/server/sql/preferences/insert_default_row.sql
+++ b/src/server/sql/preferences/insert_default_row.sql
@@ -15,13 +15,13 @@ IF NOT EXISTS(SELECT *
 	THEN
 	INSERT INTO preferences (display_title, default_chart_to_render, default_bar_stacking,
 	default_language, default_timezone, default_warning_file_size, default_file_size_limit,
-	default_area_normalization, default_area_unit, default_meter_reading_frequency, 
-	default_meter_minimum_value, default_meter_maximum_value, default_meter_minimum_date, 
-	default_meter_maximum_date, default_meter_reading_gap, default_meter_maximum_errors,
-	default_meter_disable_checks, default_help_url) 
-	VALUES ('', 'line', FALSE, 'en', NULL, 5, 25, FALSE, 'meters', '00:15:00', 
-	-9007199254740991, 9007199254740991, '1970-01-01 00:00:00+00:00', '6970-01-01 00:00:00+00:00',
-	0, 75, FALSE, 'https://openenergydashboard.org/');
+	default_area_normalization, default_area_unit, default_meter_reading_frequency,
+	default_meter_minimum_date, 
+	default_meter_maximum_date, default_meter_reading_gap, default_meter_maximum_errors, 
+	default_help_url) 
+	VALUES ('', 'line', FALSE, 'en', NULL, 5, 25, FALSE, 'meters', '00:15:00',
+	'1970-01-01 00:00:00+00:00', '6970-01-01 00:00:00+00:00',
+	0, 75, 'https://openenergydashboard.org/');
 END IF ;
 
 END;
diff --git a/src/server/sql/preferences/update_preferences.sql b/src/server/sql/preferences/update_preferences.sql
index f225fdf27..216e0919a 100644
--- a/src/server/sql/preferences/update_preferences.sql
+++ b/src/server/sql/preferences/update_preferences.sql
@@ -14,12 +14,9 @@ SET
 	default_area_normalization = ${defaultAreaNormalization},
 	default_area_unit = ${defaultAreaUnit},
 	default_meter_reading_frequency = ${defaultMeterReadingFrequency},
-	default_meter_minimum_value = ${defaultMeterMinimumValue},
-	default_meter_maximum_value = ${defaultMeterMaximumValue},
 	default_meter_minimum_date = ${defaultMeterMinimumDate},
 	default_meter_maximum_date = ${defaultMeterMaximumDate},
 	default_meter_reading_gap = ${defaultMeterReadingGap},
 	default_meter_maximum_errors = ${defaultMeterMaximumErrors},
-	default_meter_disable_checks = ${defaultMeterDisableChecks},
 	default_help_url = ${defaultHelpUrl}
 ;
diff --git a/src/server/sql/unit/create_disable_checks_types_enum.sql b/src/server/sql/unit/create_disable_checks_types_enum.sql
new file mode 100644
index 000000000..34b0ed0f4
--- /dev/null
+++ b/src/server/sql/unit/create_disable_checks_types_enum.sql
@@ -0,0 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+-- This should avoid an error when the type already exists. This is an issue since
+-- OED install stops the creation of database items after this.
+DO $$ BEGIN 
+	CREATE TYPE disable_checks_type AS ENUM('reject_bad', 'reject_all', 'reject_none');
+EXCEPTION
+	WHEN duplicate_object THEN null;
+END $$;
diff --git a/src/server/sql/unit/create_units_table.sql b/src/server/sql/unit/create_units_table.sql
index 075a35fc1..442f0599d 100644
--- a/src/server/sql/unit/create_units_table.sql
+++ b/src/server/sql/unit/create_units_table.sql
@@ -12,5 +12,8 @@ CREATE TABLE IF NOT EXISTS units (
 	suffix VARCHAR(50) DEFAULT '',
 	displayable displayable_type NOT NULL,
 	preferred_display BOOLEAN NOT NULL,
-	note TEXT
+	note TEXT,
+	min_val FLOAT NOT NULL DEFAULT -9007199254740991,
+    max_val FLOAT NOT NULL DEFAULT 9007199254740991 CHECK (max_val >= min_val),
+	disable_checks disable_checks_type NOT NULL DEFAULT 'reject_none'
 );
diff --git a/src/server/sql/unit/insert_new_unit.sql b/src/server/sql/unit/insert_new_unit.sql
index a4805ed5e..2d7a9c35e 100644
--- a/src/server/sql/unit/insert_new_unit.sql
+++ b/src/server/sql/unit/insert_new_unit.sql
@@ -2,6 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-INSERT INTO units(name, identifier, unit_represent, sec_in_rate, type_of_unit, suffix, displayable, preferred_display, note)
-VALUES (${name}, ${identifier}, ${unitRepresent}, ${secInRate}, ${typeOfUnit}, ${suffix}, ${displayable}, ${preferredDisplay}, ${note})
+INSERT INTO units(name, identifier, unit_represent, sec_in_rate, type_of_unit, suffix, displayable, preferred_display, note, min_val, max_val, disable_checks)
+VALUES (${name}, ${identifier}, ${unitRepresent}, ${secInRate}, ${typeOfUnit}, ${suffix}, ${displayable}, ${preferredDisplay}, ${note}, ${minVal}, ${maxVal}, ${disableChecks})
 RETURNING id;
diff --git a/src/server/sql/unit/update_unit.sql b/src/server/sql/unit/update_unit.sql
index af3594819..a91437eb0 100644
--- a/src/server/sql/unit/update_unit.sql
+++ b/src/server/sql/unit/update_unit.sql
@@ -11,5 +11,8 @@ UPDATE units
 		suffix = ${suffix},
 		displayable = ${displayable},
 		preferred_display = ${preferredDisplay},
-		note = ${note}
+		note = ${note},
+		min_val = ${minVal},
+		max_val = ${maxVal},
+		disable_checks = ${disableChecks}
 	WHERE id = ${id};
diff --git a/src/server/test/db/enumTests.js b/src/server/test/db/enumTests.js
index ce68aff2b..8bb54a65a 100644
--- a/src/server/test/db/enumTests.js
+++ b/src/server/test/db/enumTests.js
@@ -6,152 +6,181 @@
  * This class is for testing javascript objects against enum types in the database
  * Currently these are stored in both locations, so these tests ensure they are equal
  */
-const Meter = require('../../models/Meter');
-const User = require('../../models/User');
-const Unit = require('../../models/Unit');
-
-//pulls from real database instead of test database,
-//since the actual enum values are needed
-const Database = require('../../models/database');
-const DB = require('../../db');
-const { expectArrayOfUnitsToBeEquivalent } = require('../../util/compareUnits');
-const { mocha, expect } = require('../common');
-
-mocha.describe('Enums JS to DB', () => {
-    //Meter.type JS object to meter_type SQL ENUM
-	mocha.it('can equate Meter.type to SQL enum', async () => {
-		const conn = DB.getConnection();
-		let serverEnum = [];
-		let jsObject = [];
-        //SQL query returning meter_type ENUM
-		await conn.result('SELECT unnest(enum_range(NULL::meter_type));')
-			.then(data => {
-                //get meter_type enum as nested enumerations
-				let resultArray = data.rows;
-                //unnest into array for comparison
-				resultArray.forEach((item) =>{
-					serverEnum.push(item.unnest);
-				});
-                //convert Meter.type JS object properties to array for comparison
-				for(let key in Meter.type) {
-					if (Meter.type.hasOwnProperty(key)) {
-						let value = Meter.type[key];
-						jsObject.push(value);
-					}
-				}
-                //sort each array before testing against each other
-				serverEnum.sort();
-				jsObject.sort();
-				expect(serverEnum.toString()).to.equal(jsObject.toString());
-			}
-        )
-	})
-
-    //Unit.displayableType JS object to displayable_type SQL ENUM
-	mocha.it('can equate displayableType to SQL enum', async () => {
-		const conn = DB.getConnection();
-		let serverEnum = [];
-		let jsObject = [];
-        //SQL query returning displayable_type ENUM
-		await conn.result('SELECT unnest(enum_range(NULL::displayable_type));')
-			.then(data => {
-				//get displayable_type enum as nested enumerations
-				let resultArray = data.rows;
-                //unnest into array for comparison
-				resultArray.forEach((item) =>{
-					serverEnum.push(item.unnest);
-				});
-                //convert Unit.displayableType JS object properties to array for comparison
-				for(let key in Unit.displayableType) {
-					if (Unit.displayableType.hasOwnProperty(key)) {
-						let value = Unit.displayableType[key];
-						jsObject.push(value);
-                    }
-				}
-                //sort each array before testing against each other
-				serverEnum.sort();
-				jsObject.sort();
-				expect(serverEnum.toString()).to.equal(jsObject.toString());
-			}
-        )
-	})
-
-    //User.role JS object to user_type SQL ENUM
-	mocha.it('can equate User.role to SQL enum', async () => {
-        const conn = DB.getConnection();
-        let serverEnum = [];
-        let jsObject = [];
-        //SQL query returning user_type ENUM
-        await conn.result('SELECT unnest(enum_range(NULL::user_type));')
-            .then(data => {
-                //get user_type enum as nested enumerations
-                let resultArray = data.rows;
-                //unnest into array for comparison
-                resultArray.forEach((item) =>{
-                    serverEnum.push(item.unnest);
-                });
-                //convert User.role JS object properties to array for comparison
-                for(let key in User.role) {
-                    if (User.role.hasOwnProperty(key)) {
-                        let value = User.role[key];
-                        jsObject.push(value);
-                    }
-                }
-                //sort each array before testing
-                serverEnum.sort();
-                jsObject.sort();
-                expect(serverEnum.toString()).to.equal(jsObject.toString());
-            }
-        )
-    })
-
-    //Unit.areaUnitType JS object to area_unit_type SQL ENUM
-	mocha.it('can equate Unit.areaUnitType to SQL enum', async () => {
-        const conn = DB.getConnection();
-        let serverEnum = [];
-        let jsObject = [];
-        //SQL query returning area_unit_type ENUM
-        await conn.result('SELECT unnest(enum_range(NULL::area_unit_type));')
-            .then(data => {
-                //get area_unit_type enum as nested enumerations
-                let resultArray = data.rows;
-                //unnest into array for comparison
-                resultArray.forEach((item) =>{
-                    serverEnum.push(item.unnest);
-                });
-                //convert Unit.areaUnitType JS object properties to array for comparison
-                for(let key in Unit.areaUnitType) {
-                    if (Unit.areaUnitType.hasOwnProperty(key)) {
-                        let value = Unit.areaUnitType[key];
-                        jsObject.push(value);
-                    }
-                }
-                //sort each array before testing
-                serverEnum.sort();
-                jsObject.sort();
-                expect(serverEnum.toString()).to.equal(jsObject.toString());
-            }
-        )
-    })
-
-    //Unit.unitType JS object to unit_type SQL ENUM
-    mocha.it('can equate Unit.unitType to SQL enum', async () => {
+ const Meter = require('../../models/Meter');
+ const User = require('../../models/User');
+ const Unit = require('../../models/Unit');
+ 
+ //pulls from real database instead of test database,
+ //since the actual enum values are needed
+ const Database = require('../../models/database');
+ const DB = require('../../db');
+ const { expectArrayOfUnitsToBeEquivalent } = require('../../util/compareUnits');
+ const { mocha, expect } = require('../common');
+ 
+ mocha.describe('Enums JS to DB', () => {
+     //Meter.type JS object to meter_type SQL ENUM
+     mocha.it('can equate Meter.type to SQL enum', async () => {
+         const conn = DB.getConnection();
+         let serverEnum = [];
+         let jsObject = [];
+         //SQL query returning meter_type ENUM
+         await conn.result('SELECT unnest(enum_range(NULL::meter_type));')
+             .then(data => {
+                 //get meter_type enum as nested enumerations
+                 let resultArray = data.rows;
+                 //unnest into array for comparison
+                 resultArray.forEach((item) =>{
+                     serverEnum.push(item.unnest);
+                 });
+                 //convert Meter.type JS object properties to array for comparison
+                 for(let key in Meter.type) {
+                     if (Meter.type.hasOwnProperty(key)) {
+                         let value = Meter.type[key];
+                         jsObject.push(value);
+                     }
+                 }
+                 //sort each array before testing against each other
+                 serverEnum.sort();
+                 jsObject.sort();
+                 expect(serverEnum.toString()).to.equal(jsObject.toString());
+             }
+         )
+     })
+ 
+     //Unit.displayableType JS object to displayable_type SQL ENUM
+     mocha.it('can equate displayableType to SQL enum', async () => {
+         const conn = DB.getConnection();
+         let serverEnum = [];
+         let jsObject = [];
+         //SQL query returning displayable_type ENUM
+         await conn.result('SELECT unnest(enum_range(NULL::displayable_type));')
+             .then(data => {
+                 //get displayable_type enum as nested enumerations
+                 let resultArray = data.rows;
+                 //unnest into array for comparison
+                 resultArray.forEach((item) =>{
+                     serverEnum.push(item.unnest);
+                 });
+                 //convert Unit.displayableType JS object properties to array for comparison
+                 for(let key in Unit.displayableType) {
+                     if (Unit.displayableType.hasOwnProperty(key)) {
+                         let value = Unit.displayableType[key];
+                         jsObject.push(value);
+                     }
+                 }
+                 //sort each array before testing against each other
+                 serverEnum.sort();
+                 jsObject.sort();
+                 expect(serverEnum.toString()).to.equal(jsObject.toString());
+             }
+         )
+     })
+ 
+     //User.role JS object to user_type SQL ENUM
+     mocha.it('can equate User.role to SQL enum', async () => {
+         const conn = DB.getConnection();
+         let serverEnum = [];
+         let jsObject = [];
+         //SQL query returning user_type ENUM
+         await conn.result('SELECT unnest(enum_range(NULL::user_type));')
+             .then(data => {
+                 //get user_type enum as nested enumerations
+                 let resultArray = data.rows;
+                 //unnest into array for comparison
+                 resultArray.forEach((item) =>{
+                     serverEnum.push(item.unnest);
+                 });
+                 //convert User.role JS object properties to array for comparison
+                 for(let key in User.role) {
+                     if (User.role.hasOwnProperty(key)) {
+                         let value = User.role[key];
+                         jsObject.push(value);
+                     }
+                 }
+                 //sort each array before testing
+                 serverEnum.sort();
+                 jsObject.sort();
+                 expect(serverEnum.toString()).to.equal(jsObject.toString());
+             }
+         )
+     })
+ 
+     //Unit.areaUnitType JS object to area_unit_type SQL ENUM
+     mocha.it('can equate Unit.areaUnitType to SQL enum', async () => {
+         const conn = DB.getConnection();
+         let serverEnum = [];
+         let jsObject = [];
+         //SQL query returning area_unit_type ENUM
+         await conn.result('SELECT unnest(enum_range(NULL::area_unit_type));')
+             .then(data => {
+                 //get area_unit_type enum as nested enumerations
+                 let resultArray = data.rows;
+                 //unnest into array for comparison
+                 resultArray.forEach((item) =>{
+                     serverEnum.push(item.unnest);
+                 });
+                 //convert Unit.areaUnitType JS object properties to array for comparison
+                 for(let key in Unit.areaUnitType) {
+                     if (Unit.areaUnitType.hasOwnProperty(key)) {
+                         let value = Unit.areaUnitType[key];
+                         jsObject.push(value);
+                     }
+                 }
+                 //sort each array before testing
+                 serverEnum.sort();
+                 jsObject.sort();
+                 expect(serverEnum.toString()).to.equal(jsObject.toString());
+             }
+         )
+     })
+ 
+     //Unit.unitType JS object to unit_type SQL ENUM
+     mocha.it('can equate Unit.unitType to SQL enum', async () => {
+         const conn = DB.getConnection();
+         let serverEnum = [];
+         let jsEnum = [];
+         //SQL query returning unit_type ENUM
+         await conn.result('SELECT unnest(enum_range(NULL::unit_type));')
+             .then(data => {
+                 //get unit_type enum as nested enumerations
+                 let resultArray = data.rows;
+                 //unnest into array for comparison
+                 resultArray.forEach((item) =>{
+                     serverEnum.push(item.unnest);
+                 });
+                 //convert Unit.unitType JS object properties to array for comparison
+                 for(let key in Unit.unitType) {
+                     if (Unit.unitType.hasOwnProperty(key)) {
+                         let value = Unit.unitType[key];
+                         jsEnum.push(value);
+                     }
+                 }
+                 //sort each array before testing
+                 serverEnum.sort();
+                 jsEnum.sort();
+                 expect(serverEnum.toString()).to.equal(jsEnum.toString());
+             }
+         )
+     })
+     
+    //Unit.disableChecksType JS object to disable_checks_type SQL ENUM
+    mocha.it('can equate Unit.disableChecksType to SQL enum', async () => {
         const conn = DB.getConnection();
         let serverEnum = [];
         let jsEnum = [];
-        //SQL query returning unit_type ENUM
-        await conn.result('SELECT unnest(enum_range(NULL::unit_type));')
+        //SQL query returning disable_checks_type ENUM
+        await conn.result('SELECT unnest(enum_range(NULL::disable_checks_type));')
             .then(data => {
-                //get unit_type enum as nested enumerations
+                //get disable_checks_type enum as nested enumerations
                 let resultArray = data.rows;
                 //unnest into array for comparison
-                resultArray.forEach((item) =>{
+                resultArray.forEach((item) => {
                     serverEnum.push(item.unnest);
                 });
-                //convert Unit.unitType JS object properties to array for comparison
-                for(let key in Unit.unitType) {
-                    if (Unit.unitType.hasOwnProperty(key)) {
-                        let value = Unit.unitType[key];
+                //convert Unit.disableChecksType JS object properties to array for comparison
+                for (let key in Unit.disableChecksType) {
+                    if (Unit.disableChecksType.hasOwnProperty(key)) {
+                        let value = Unit.disableChecksType[key];
                         jsEnum.push(value);
                     }
                 }
@@ -160,6 +189,6 @@ mocha.describe('Enums JS to DB', () => {
                 jsEnum.sort();
                 expect(serverEnum.toString()).to.equal(jsEnum.toString());
             }
-        )
-    })
-});
\ No newline at end of file
+            )
+    })        
+ });
\ No newline at end of file