diff --git a/src/js/modules/infragistics.ui.editors.js b/src/js/modules/infragistics.ui.editors.js
index 48d634025..6dd0b57c3 100644
--- a/src/js/modules/infragistics.ui.editors.js
+++ b/src/js/modules/infragistics.ui.editors.js
@@ -10357,7 +10357,7 @@
 
 			// N.A. 3/12/2016 Bug #215134: When we enter a value and spin before the date is created, we create a today date, cause everything is empty.
 			if (!this._dateObjectValue && mask.indexOf(unfilled) >= 0) {
-				mask = this._initEmptyMask(this._dateObjectValue);
+				mask = this._initEmptyMask(this._dateObjectValue, mask);
 				mask = mask.substring(0, time.startPosition) +
 					currentValueString +
 					mask.substring(time.endPosition, mask.length);
@@ -10393,15 +10393,15 @@
 			}
 			return mask;
 		},
-		_initEmptyMask: function (date) {
-			var mask = this._maskWithPrompts,
-				today = this._setNewDateMidnight(),
-				timeYear, timeMonth, timeDay, timeHours,
+		_initEmptyMask: function (date, mask) {
+			mask = mask || this._maskWithPrompts;
+			var	timeYear, timeMonth, timeDay, timeHours,
 				timeAmOrPM, timeMinutes, timeSeconds, timeMilliseconds,
 				year, month, day, hours, amPM, minutes, seconds, milliseconds;
 
 			if (!date) {
-				date = today;
+				// V.S. Apr 2nd 2018, #1902 If there is not previous value, get value from mask
+				date = this._parseDateFromMaskedValue(mask);
 			}
 
 			timeYear = this._createYearPosition();
@@ -10463,7 +10463,7 @@
 			if (mask === undefined) {
 				return;
 			} else if (mask === "" || mask === this._maskWithPrompts) {
-				mask = this._initEmptyMask(this._dateObjectValue);
+				mask = this._initEmptyMask(this._dateObjectValue, mask);
 			} else {
 				mask = this._updateTimeMask(mask, time, delta);
 			}
diff --git a/tests/unit/editors/dateEditor/dateEditor-test.js b/tests/unit/editors/dateEditor/dateEditor-test.js
index d54b62c6f..e24c055a7 100644
--- a/tests/unit/editors/dateEditor/dateEditor-test.js
+++ b/tests/unit/editors/dateEditor/dateEditor-test.js
@@ -3877,7 +3877,7 @@ QUnit.test('Edge case testing', function (assert) {
 	});
 	$dtEditor.igDateEditor("option", "dataMode", "data");
 	$dtEditor.blur();
-	assert.equal($dtEditor.igDateEditor("displayValue"), "3/1/2015" , "Display value is not correct");
+	assert.equal($dtEditor.igDateEditor("displayValue"), "3/1/2015", "Display value is not correct");
 	assert.equal($dtEditor.igDateEditor("value").getTime(), new Date("3/1/2015").getTime(), "Display value is not correct");
 
 	$dtEditor.igDateEditor("value", null);
@@ -4554,4 +4554,51 @@ QUnit.test('Test plain values that are not containing mask values', function (as
 
 	assert.equal($dtEditor.igDateEditor("displayValue"), "1/1/2018 12:00 AM", 'The value is not as expected');
 	assert.equal($dtEditor.igDateEditor("value").getTime(), new Date(2018, 0, 1).getTime(), "Runtime time display format not applied");
+});
+
+QUnit.test('Should properly retain partial mask value on spin when w/ no prior valid value', function (assert) {
+	assert.expect(2);
+
+	var $dtEditor = this.util.appendToFixture(this.inputTag).igDateEditor({
+		value: new Date(2017, 11, 8, 12, 45),
+		dataMode: "date",
+		dateInputFormat: "dateTime",
+		buttonType: "clear, spin"
+	}),
+		clearButton = $dtEditor.igDateEditor("clearButton"),
+		done = assert.async(),
+		util = this.util,
+		expectedValue;
+
+		var input = [48,50,48,50,50,48,49,50,49,50,50,48,39]; // 020220121210 + arrowright
+	
+	$dtEditor.igDateEditor("setFocus");
+
+	this.util.wait(100).then(function () {
+		$dtEditor.igDateEditor("field").parent().parent().css({ position: 'fixed', top: 12, left: 12, width: '400px'});
+		clearButton.click();
+		return util.wait(100);
+	}).then(function () {
+		var editor = $dtEditor.igDateEditor("field");
+		$dtEditor.igDateEditor("setFocus");
+		for (var i=0; i < input.length; i++) {
+			util.keyInteraction(input[i], editor);
+		}
+		return util.wait(100);
+	}).then(function () {
+		var selectionStart = $dtEditor.igDateEditor('field').val().length - 2;
+		$dtEditor.igDateEditor('field')[0].setSelectionRange(selectionStart, selectionStart + 1);
+		util.keyInteraction(40, $dtEditor.igDateEditor("field"));
+		return util.wait(100);
+	}).then(function () {
+		util.keyInteraction(13, editor = $dtEditor.igDateEditor("field"));
+		expectedValue = new Date(2012, 1, 2, 0, 20);
+		assert.equal($dtEditor.igDateEditor("option", "value").getTime(), expectedValue.getTime(), 'The initial value is not as expected');
+		assert.equal($dtEditor.igDateEditor("displayValue"), "2/2/2012 12:20 AM", 'The initial value is not as expected');
+		done();
+	}).catch(function (er) {
+		assert.pushResult({ result: false, message: er.message });
+		done();
+		throw er;
+	});
 });
\ No newline at end of file