diff --git a/fet2020/finance/forms.py b/fet2020/finance/forms.py
index 50edde15..32f67107 100644
--- a/fet2020/finance/forms.py
+++ b/fet2020/finance/forms.py
@@ -312,18 +312,7 @@ class ResolutionAdminForm(forms.ModelForm):
     class Meta:
         model = Resolution
 
-        fields = [
-            "name",
-            "id",
-            "date",
-            "option",
-            "is_visible",
-            "budget",
-            "total",
-            "budget_remaining",
-            "voting",
-            "voting_text",
-        ]
+        fields = "__all__"
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)  # to get the self.fields set
@@ -348,6 +337,12 @@ class ResolutionAdminForm(forms.ModelForm):
         self.fields["budget_remaining"].label = "Restbudget (EUR)"
         self.fields["budget_remaining"].required = False
 
+        self.fields["budget"].required = False
+
+        if resolution is not None:
+            self.fields["id"].disabled = True
+            self.fields["id"].required = False
+
 
 class WirefAdminForm(forms.ModelForm):
     total = forms.CharField()