diff --git a/daemon_post_confirm.py b/daemon_post_confirm.py
index 3921702d7..3079758e3 100644
--- a/daemon_post_confirm.py
+++ b/daemon_post_confirm.py
@@ -192,7 +192,7 @@ def follow_confirm2(self, calling_domain: str, cookie: str,
     if '&submitView=' in follow_confirm_params:
         following_actor = \
             urllib.parse.unquote_plus(follow_confirm_params)
-        following_actor = following_actor.split('actor=')[1]
+        following_actor = following_actor.split('actorUrl=')[1]
         if '&' in following_actor:
             following_actor = following_actor.split('&')[0]
         redirect_headers(self, following_actor, cookie, calling_domain, 303)
diff --git a/daemon_utils.py b/daemon_utils.py
index 1986f35a9..98de18ec5 100644
--- a/daemon_utils.py
+++ b/daemon_utils.py
@@ -615,6 +615,7 @@ def show_person_options(self, calling_domain: str, path: str,
         page_number = 1
         options_list = options_str.split(';')
         options_actor = options_list[0]
+        options_actor_url = options_actor
         options_page_number = 1
         if len(options_list) > 1:
             options_page_number = options_list[1]
@@ -670,6 +671,9 @@ def show_person_options(self, calling_domain: str, path: str,
                                   options_actor,
                                   self.server.person_cache)
         if actor_json:
+            if actor_json.get('url'):
+                if isinstance(actor_json['url'], str):
+                    options_actor_url = actor_json['url']
             if actor_json.get('movedTo'):
                 if isinstance(actor_json['movedTo'], str):
                     moved_to = remove_html(actor_json['movedTo'])
@@ -750,6 +754,7 @@ def show_person_options(self, calling_domain: str, path: str,
                                 domain_full,
                                 origin_path_str,
                                 options_actor,
+                                options_actor_url,
                                 options_profile_url,
                                 options_link,
                                 page_number, donate_url, website_url,
diff --git a/webapp_person_options.py b/webapp_person_options.py
index 00297bc97..a7a8679c4 100644
--- a/webapp_person_options.py
+++ b/webapp_person_options.py
@@ -142,6 +142,7 @@ def html_person_options(default_timeline: str,
                         domain: str, domain_full: str,
                         origin_path_str: str,
                         options_actor: str,
+                        options_actor_url: str,
                         options_profile_url: str,
                         options_link: str,
                         page_number: int,
@@ -527,6 +528,8 @@ def html_person_options(default_timeline: str,
         str(page_number) + '">\n'
     options_str += '    <input type="hidden" name="actor" value="' + \
         options_actor + '">\n'
+    options_str += '    <input type="hidden" name="actorUrl" value="' + \
+        options_actor_url + '">\n'
     options_str += '    <input type="hidden" name="avatarUrl" value="' + \
         options_profile_url + '">\n'