diff --git a/machines/templates/machines/machine.html b/machines/templates/machines/machine.html
index 1b8646ea..5e90447e 100644
--- a/machines/templates/machines/machine.html
+++ b/machines/templates/machines/machine.html
@@ -45,7 +45,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% bootstrap_form machineform %}
     {% endif %}
     {% if interfaceform %}
+        {% if i_choices %}
+            {% if i_match_func %}
+    {% bootstrap_form_typeahead interfaceform 'ipv4' choices=i_choices match_func=i_match_func %}
+            {% else %}
+    {% bootstrap_form_typeahead interfaceform 'ipv4' choices=i_choices %}
+	    {% endif %}
+        {% else %}
+            {% if i_match_func %}
+    {% bootstrap_form_typeahead interfaceform 'ipv4' match_func=i_match_func %}
+            {% else %}
     {% bootstrap_form_typeahead interfaceform 'ipv4' %}
+	    {% endif %}
+        {% endif %}
     {% endif %}
     {% if domainform %}
     {% bootstrap_form domainform %}