diff --git a/src/djangooidc/views.py b/src/djangooidc/views.py
index b786ed2e9..2fc2a0363 100644
--- a/src/djangooidc/views.py
+++ b/src/djangooidc/views.py
@@ -82,12 +82,12 @@ def login_callback(request):
         if user:
             login(request, user)
             logger.info("Successfully logged in user %s" % user)
-            # Double login bug?
+            # Double login bug (1507)?
             return redirect(request.session.get("next", "/"))
         else:
             raise o_e.BannedUser()
     except o_e.NoStateDefined as nsd_err:
-        logger.debug(f"No State Defined: {nsd_err}")
+        logger.warning(f"No State Defined: {nsd_err}")
         return redirect(request.session.get("next", "/"))
     except Exception as err:
         return error_page(request, err)
diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 125ff2e8a..eee808691 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1240,14 +1240,14 @@ class DraftDomainAdmin(ListHeaderAdmin):
 
 
 class VeryImportantPersonAdmin(ListHeaderAdmin):
-    list_display = ("email", "user", "truncated_notes", "created_at")
+    list_display = ("email", "requestor", "truncated_notes", "created_at")
     search_fields = ["email"]
     search_help_text = "Search by email."
     list_filter = [
-        "user",
+        "requestor",
     ]
     readonly_fields = [
-        "user",
+        "requestor",
     ]
 
     def truncated_notes(self, obj):
@@ -1258,7 +1258,7 @@ class VeryImportantPersonAdmin(ListHeaderAdmin):
 
     def save_model(self, request, obj, form, change):
         # Set the user field to the current admin user
-        obj.user = request.user if request.user.is_authenticated else None
+        obj.requestor = request.requestor if request.requestor.is_authenticated else None
         super().save_model(request, obj, form, change)
 
 
diff --git a/src/registrar/migrations/0063_veryimportantperson.py b/src/registrar/migrations/0063_veryimportantperson.py
index 3d56ae1ac..29ea7ffdb 100644
--- a/src/registrar/migrations/0063_veryimportantperson.py
+++ b/src/registrar/migrations/0063_veryimportantperson.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.7 on 2024-01-19 00:18
+# Generated by Django 4.2.7 on 2024-01-23 21:02
 
 from django.conf import settings
 from django.db import migrations, models
@@ -17,10 +17,10 @@ class Migration(migrations.Migration):
                 ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
                 ("created_at", models.DateTimeField(auto_now_add=True)),
                 ("updated_at", models.DateTimeField(auto_now=True)),
-                ("email", models.EmailField(blank=True, db_index=True, help_text="Email", max_length=254, null=True)),
-                ("notes", models.TextField(blank=True, help_text="Notes", null=True)),
+                ("email", models.EmailField(blank=True, db_index=True, help_text="Email", max_length=254)),
+                ("notes", models.TextField(blank=True, help_text="Notes")),
                 (
-                    "user",
+                    "requestor",
                     models.ForeignKey(
                         blank=True,
                         null=True,
diff --git a/src/registrar/models/very_important_person.py b/src/registrar/models/very_important_person.py
index 42621c64a..2fb53ff27 100644
--- a/src/registrar/models/very_important_person.py
+++ b/src/registrar/models/very_important_person.py
@@ -8,13 +8,13 @@ class VeryImportantPerson(TimeStampedModel):
     """"""
 
     email = models.EmailField(
-        null=True,
+        null=False,
         blank=True,
         help_text="Email",
         db_index=True,
     )
 
-    user = models.ForeignKey(
+    requestor = models.ForeignKey(
         "registrar.User",
         null=True,
         blank=True,
@@ -23,14 +23,10 @@ class VeryImportantPerson(TimeStampedModel):
     )
 
     notes = models.TextField(
-        null=True,
+        null=False,
         blank=True,
         help_text="Notes",
     )
 
     def __str__(self):
-        try:
-            if self.email:
-                return self.email
-        except Exception:
-            return ""
+        return self.email
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 175bef11f..139e4bc84 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -1755,10 +1755,10 @@ class VeryImportantPersonAdminTestCase(TestCase):
 
         # Create a request object
         request = self.factory.post("/admin/yourapp/veryimportantperson/add/")
-        request.user = self.superuser
+        request.requestor = self.superuser
 
         # Call the save_model method
         admin_instance.save_model(request, vip_instance, None, None)
 
         # Check that the user field is set to the request.user
-        self.assertEqual(vip_instance.user, self.superuser)
+        self.assertEqual(vip_instance.requestor, self.superuser)