diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 922e2ce27..75c582b99 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -413,7 +413,7 @@ class IPAddressEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.change_ipaddress'
     model = IPAddress
     form_class = forms.IPAddressForm
-    fields_initial = ['ipaddress']
+    fields_initial = ['address', 'vrf']
     template_name = 'ipam/ipaddress_edit.html'
     cancel_url = 'ipam:ipaddress_list'
 
diff --git a/netbox/templates/ipam/inc/prefix_header.html b/netbox/templates/ipam/inc/prefix_header.html
index 69c5f6860..8bbdfe055 100644
--- a/netbox/templates/ipam/inc/prefix_header.html
+++ b/netbox/templates/ipam/inc/prefix_header.html
@@ -24,6 +24,12 @@
     </div>
 </div>
 <div class="pull-right">
+    {% if perms.ipam.add_ipaddress %}
+		<a href="{% url 'ipam:ipaddress_add' %}?address={{ prefix.prefix }}{% if prefix.vrf %}&vrf={{ prefix.vrf.pk }}{% endif %}" class="btn btn-success">
+			<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+			Add an IP Address
+		</a>
+    {% endif %}
     {% if perms.ipam.change_prefix %}
 		<a href="{% url 'ipam:prefix_edit' pk=prefix.pk %}" class="btn btn-warning">
 			<span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>