diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26b57caec..c5a4ec680 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+v2.6.1 (FUTURE)
+
+## Bug Fixes
+
+* [#3275](https://github.com/digitalocean/netbox/issues/3275) - Fix error when adding power outlets to a device type
+
+---
+
 v2.6.0 (2019-06-20)
 
 ## New Features
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 1ae7b76f4..060d7ba50 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -951,10 +951,6 @@ class PowerPortTemplateCreateForm(ComponentForm):
 
 
 class PowerOutletTemplateForm(BootstrapMixin, forms.ModelForm):
-    power_port = forms.ModelChoiceField(
-        queryset=PowerPortTemplate.objects.all(),
-        required=False
-    )
 
     class Meta:
         model = PowerOutletTemplate
@@ -965,6 +961,21 @@ class PowerOutletTemplateForm(BootstrapMixin, forms.ModelForm):
             'device_type': forms.HiddenInput(),
         }
 
+
+class PowerOutletTemplateCreateForm(ComponentForm):
+    name_pattern = ExpandableNameField(
+        label='Name'
+    )
+    power_port = forms.ModelChoiceField(
+        queryset=PowerPortTemplate.objects.all(),
+        required=False
+    )
+    feed_leg = forms.ChoiceField(
+        choices=add_blank_choice(POWERFEED_LEG_CHOICES),
+        required=False,
+        widget=StaticSelect2()
+    )
+
     def __init__(self, *args, **kwargs):
 
         super().__init__(*args, **kwargs)
@@ -975,12 +986,6 @@ class PowerOutletTemplateForm(BootstrapMixin, forms.ModelForm):
         )
 
 
-class PowerOutletTemplateCreateForm(ComponentForm):
-    name_pattern = ExpandableNameField(
-        label='Name'
-    )
-
-
 class InterfaceTemplateForm(BootstrapMixin, forms.ModelForm):
 
     class Meta:
diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index aafb35a0f..3958e1326 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -433,7 +433,7 @@ class PowerOutletTemplateTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = PowerOutletTemplate
-        fields = ('pk', 'name')
+        fields = ('pk', 'name', 'power_port', 'feed_leg')
         empty_text = "None"