diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index ec596d612..53984c464 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -612,6 +612,7 @@ class VLANGroupFilterForm(BootstrapMixin, forms.Form):
 class VLANForm(BootstrapMixin, TenancyForm, CustomFieldForm):
     site = forms.ModelChoiceField(
         queryset=Site.objects.all(),
+        required=False,
         widget=forms.Select(
             attrs={'filter-for': 'group', 'nullable': 'true'}
         )
diff --git a/netbox/templates/ipam/vlan_edit.html b/netbox/templates/ipam/vlan_edit.html
index 1d468ceb9..3bfb7783e 100644
--- a/netbox/templates/ipam/vlan_edit.html
+++ b/netbox/templates/ipam/vlan_edit.html
@@ -5,11 +5,11 @@
     <div class="panel panel-default">
         <div class="panel-heading"><strong>VLAN</strong></div>
         <div class="panel-body">
-            {% render_field form.site %}
-            {% render_field form.group %}
             {% render_field form.vid %}
             {% render_field form.name %}
             {% render_field form.status %}
+            {% render_field form.site %}
+            {% render_field form.group %}
             {% render_field form.role %}
             {% render_field form.description %}
         </div>