diff --git a/platform/forms/src/controllers/AutocompleteController.js b/platform/forms/src/controllers/AutocompleteController.js
index d7fd7baa8d..85fb23ded1 100644
--- a/platform/forms/src/controllers/AutocompleteController.js
+++ b/platform/forms/src/controllers/AutocompleteController.js
@@ -64,12 +64,11 @@ define(
 
             function fillInputWithString(string) {
                 $scope.hideOptions = true;
-                // Hard coded!!
-                $scope.ngModel[4] = string;
+                $scope.ngModel[$scope.field] = string;
             }
 
             function fillInputWithIndexedOption() {
-                $scope.ngModel[4] = $scope.filteredOptions[$scope.optionIndex].name;
+                $scope.ngModel[$scope.field] = $scope.filteredOptions[$scope.optionIndex].name;
             }
 
             $scope.keyDown = function($event) {