diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index d21af1296..372428e61 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -114,7 +114,7 @@ VLAN_LINK = """
 {% if record.pk %}
     <a href="{{ record.get_absolute_url }}">{{ record.vid }}</a>
 {% elif perms.ipam.add_vlan %}
-    <a href="{% url 'ipam:vlan_add' %}?vid={{ record.vid }}&site={{ vlan_group.site.pk }}&group={{ vlan_group.pk }}" class="btn btn-xs btn-success">{{ record.available }} VLAN{{ record.available|pluralize }} available</a>
+    <a href="{% url 'ipam:vlan_add' %}?vid={{ record.vid }}&group={{ vlan_group.pk }}{% if vlan_group.site %}&site={{ vlan_group.site.pk }}{% endif %}" class="btn btn-xs btn-success">{{ record.available }} VLAN{{ record.available|pluralize }} available</a>
 {% else %}
     {{ record.available }} VLAN{{ record.available|pluralize }} available
 {% endif %}
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 485a7eed0..fe5189473 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -858,12 +858,6 @@ class VLANGroupVLANsView(View):
         vlans = VLAN.objects.filter(group_id=pk)
         vlans = add_available_vlans(vlan_group, vlans)
 
-        first_available_vlan = 0
-        for v in vlans:
-            if not type(v) == VLAN:
-                first_available_vlan = v['vid']
-                break
-
         vlan_table = tables.VLANDetailTable(vlans)
         if request.user.has_perm('ipam.change_vlan') or request.user.has_perm('ipam.delete_vlan'):
             vlan_table.columns.show('pk')
@@ -885,7 +879,7 @@ class VLANGroupVLANsView(View):
 
         return render(request, 'ipam/vlangroup_vlans.html', {
             'vlan_group': vlan_group,
-            'first_available_vlan': first_available_vlan,
+            'first_available_vlan': vlan_group.get_next_available_vid(),
             'vlan_table': vlan_table,
             'permissions': permissions,
         })
diff --git a/netbox/templates/ipam/inc/vlangroup_header.html b/netbox/templates/ipam/inc/vlangroup_header.html
index 7decbabfe..221f41994 100644
--- a/netbox/templates/ipam/inc/vlangroup_header.html
+++ b/netbox/templates/ipam/inc/vlangroup_header.html
@@ -1,6 +1,6 @@
 <div class="pull-right">
     {% if perms.ipam.add_vlan and first_available_vlan %}
-        <a href="{% url 'ipam:vlan_add' %}?vid={{ first_available_vlan }}&group={{ vlan_group.pk }}&site={{ vlan_group.site.pk }}" class="btn btn-success">
+        <a href="{% url 'ipam:vlan_add' %}?vid={{ first_available_vlan }}&group={{ vlan_group.pk }}{% if vlan_group.site %}&site={{ vlan_group.site.pk }}{% endif %}" class="btn btn-success">
             <i class="fa fa-plus" aria-hidden="true"></i> Add a VLAN
         </a>
     {% endif %}
diff --git a/netbox/templates/ipam/vlangroup_vlans.html b/netbox/templates/ipam/vlangroup_vlans.html
index 5a2efe30a..49532fb95 100644
--- a/netbox/templates/ipam/vlangroup_vlans.html
+++ b/netbox/templates/ipam/vlangroup_vlans.html
@@ -7,7 +7,9 @@
     <div class="col-sm-12 col-md-12">
         <ol class="breadcrumb">
             <li><a href="{% url 'ipam:vlangroup_list' %}">VLAN Groups</a></li>
-            <li><a href="{% url 'dcim:site' slug=vlan_group.site.slug %}">{{ vlan_group.site }}</a></li>
+            {% if vlan_group.site %}
+                <li><a href="{% url 'dcim:site' slug=vlan_group.site.slug %}">{{ vlan_group.site }}</a></li>
+            {% endif %}
             <li>{{ vlan_group }}</li>
         </ol>
     </div>