diff --git a/atst/domain/users.py b/atst/domain/users.py
index 2eb7b0d9..3728c04f 100644
--- a/atst/domain/users.py
+++ b/atst/domain/users.py
@@ -28,11 +28,11 @@ class Users(object):
         return user
 
     @classmethod
-    def create(cls, atat_role_name=None, **kwargs):
+    def create(cls, dod_id, atat_role_name=None, **kwargs):
         atat_role = Roles.get(atat_role_name)
 
         try:
-            user = User(atat_role=atat_role, **kwargs)
+            user = User(dod_id=dod_id, atat_role=atat_role, **kwargs)
             db.session.add(user)
             db.session.commit()
         except IntegrityError:
@@ -46,7 +46,7 @@ class Users(object):
         try:
             user = Users.get_by_dod_id(dod_id)
         except NotFoundError:
-            user = Users.create(dod_id=dod_id, **kwargs)
+            user = Users.create(dod_id, **kwargs)
             db.session.add(user)
             db.session.commit()
 
diff --git a/tests/domain/test_users.py b/tests/domain/test_users.py
index f27f26aa..72917f5b 100644
--- a/tests/domain/test_users.py
+++ b/tests/domain/test_users.py
@@ -8,13 +8,13 @@ DOD_ID = "my_dod_id"
 
 
 def test_create_user():
-    user = Users.create("developer", dod_id=DOD_ID)
+    user = Users.create(DOD_ID, "developer")
     assert user.atat_role.name == "developer"
 
 
 def test_create_user_with_nonexistent_role():
     with pytest.raises(NotFoundError):
-        Users.create("nonexistent", dod_id=DOD_ID)
+        Users.create(DOD_ID, "nonexistent")
 
 
 def test_get_or_create_nonexistent_user():
@@ -29,37 +29,37 @@ def test_get_or_create_existing_user():
 
 
 def test_get_user():
-    new_user = Users.create("developer", dod_id=DOD_ID)
+    new_user = Users.create(DOD_ID, "developer")
     user = Users.get(new_user.id)
     assert user.id == new_user.id
 
 
 def test_get_nonexistent_user():
-    Users.create("developer", dod_id=DOD_ID)
+    Users.create(DOD_ID, "developer")
     with pytest.raises(NotFoundError):
         Users.get(uuid4())
 
 
 def test_get_user_by_dod_id():
-    new_user = Users.create("developer", dod_id=DOD_ID)
+    new_user = Users.create(DOD_ID, "developer")
     user = Users.get_by_dod_id(DOD_ID)
     assert user == new_user
 
 
 def test_update_user():
-    new_user = Users.create("developer", dod_id=DOD_ID)
+    new_user = Users.create(DOD_ID, "developer")
     updated_user = Users.update(new_user.id, "ccpo")
 
     assert updated_user.atat_role.name == "ccpo"
 
 
 def test_update_nonexistent_user():
-    Users.create("developer", dod_id=DOD_ID)
+    Users.create(DOD_ID, "developer")
     with pytest.raises(NotFoundError):
         Users.update(uuid4(), "ccpo")
 
 
 def test_update_existing_user_with_nonexistent_role():
-    new_user = Users.create("developer", dod_id=DOD_ID)
+    new_user = Users.create(DOD_ID, "developer")
     with pytest.raises(NotFoundError):
         Users.update(new_user.id, "nonexistent")