diff --git a/users/models/follow.py b/users/models/follow.py
index cd05fcf..a3959c9 100644
--- a/users/models/follow.py
+++ b/users/models/follow.py
@@ -17,7 +17,7 @@ logger = logging.getLogger(__name__)
 class FollowStates(StateGraph):
     unrequested = State(try_interval=600)
     pending_approval = State(externally_progressed=True)
-    accepting = State(try_interval=24 * 60 * 60)
+    accepting = State(try_interval=600)
     rejecting = State(try_interval=24 * 60 * 60)
     accepted = State(externally_progressed=True)
     undone = State(try_interval=24 * 60 * 60)
@@ -92,6 +92,9 @@ class FollowStates(StateGraph):
     @classmethod
     def handle_accepting(cls, instance: "Follow"):
         if not instance.source.local:
+            # Don't send Accept if remote identity wasn't fetch yet
+            if not instance.source.inbox_uri:
+                return
             # send an Accept object to the source server
             try:
                 instance.target.signed_request(