diff --git a/api.saladeaula.digital/app/routes/orgs/__init__.py b/api.saladeaula.digital/app/routes/orgs/__init__.py
index 87bee13..ebca1a2 100644
--- a/api.saladeaula.digital/app/routes/orgs/__init__.py
+++ b/api.saladeaula.digital/app/routes/orgs/__init__.py
@@ -33,6 +33,9 @@ class CNPJConflictError(ConflictError): ...
 class EmailConflictError(ConflictError): ...
 
 
+class UserNotFoundError(NotFoundError): ...
+
+
 class EmailNotFoundError(NotFoundError): ...
 
 
@@ -124,6 +127,11 @@ def add_org(
                 'created_at': now_,
             }
         )
+        transact.condition(
+            key=KeyPair(str(user.id), '0'),
+            cond_expr='attribute_exists(sk)',
+            exc_cls=UserNotFoundError,
+        )
         transact.condition(
             # Post-migration (users): rename `email` to `EMAIL`
             key=KeyPair('email', user.email),