diff --git a/src/apps/common/submodules/e911/e911.js b/src/apps/common/submodules/e911/e911.js
index 04e028522..470d7b284 100644
--- a/src/apps/common/submodules/e911/e911.js
+++ b/src/apps/common/submodules/e911/e911.js
@@ -227,6 +227,11 @@ define(function(require) {
 		},
 
 		e911Format: function(data) {
+			if (_.isUndefined(data)) {
+				return;
+			}
+
+			data.full_street_address = _.get(data, 'legacy_data.house_number') + ' ' + _.get(data, 'street_address');
 			return _.merge({}, data, {
 				notification_contact_emails: _
 					.chain(data)
diff --git a/src/apps/common/submodules/e911/views/dialog.html b/src/apps/common/submodules/e911/views/dialog.html
index 7a5d50148..29bab548b 100644
--- a/src/apps/common/submodules/e911/views/dialog.html
+++ b/src/apps/common/submodules/e911/views/dialog.html
@@ -18,7 +18,7 @@
 			<div class="control-group">
 				<label class="control-label" for="street_address">{{ i18n.e911.addressLine1 }}</label>
 				<div class="controls">
-					<input id="street_address" type="text" placeholder='{{ i18n.e911.addressLine1 }}' name="street_address" value="{{legacy_data.house_number}} {{street_address}}" />
+					<input id="street_address" type="text" placeholder='{{ i18n.e911.addressLine1 }}' name="street_address" value="{{full_street_address}}" />
 				</div>
 			</div>
 			<div class="control-group">