diff --git a/netbox/extras/migrations/0108_script_models.py b/netbox/extras/migrations/0108_script_models.py
index a1617265c..f83fbe165 100644
--- a/netbox/extras/migrations/0108_script_models.py
+++ b/netbox/extras/migrations/0108_script_models.py
@@ -36,6 +36,10 @@ def update_scripts(apps, schema_editor):
             obj.is_valid = False
             obj.save()
 
+        rule.action_object_type = ct
+        rule.action_object_id = obj.id
+        rule.save()
+
 
 class Migration(migrations.Migration):
 
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index ca0a9671a..e0c83e283 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -1074,13 +1074,13 @@ class ScriptView(BaseScriptView):
 
         form = None
         if self.script_class:
-            form = script_class.as_form(initial=normalize_querydict(request.GET))
+            form = self.script_class.as_form(initial=normalize_querydict(request.GET))
 
         return render(request, 'extras/script.html', {
             'job_count': self.jobs.count(),
-            'module': script.module,
-            'script': script,
-            'script_class': script_class,
+            'module': self.script.module,
+            'script': self.script,
+            'script_class': self.script_class,
             'form': form,
         })