diff --git a/daemon.py b/daemon.py
index 5bf5fca8e..6b8e61810 100644
--- a/daemon.py
+++ b/daemon.py
@@ -5091,6 +5091,7 @@ class PubServer(BaseHTTPRequestHandler):
                 optionsProfileUrl = optionsProfileUrl.replace('.' + ext, '')
                 optionsProfileUrl = \
                     '/users/' + optionsProfileUrl + '/avatar.' + ext
+                backToPath = 'moderation'
             if optionsPageNumber.isdigit():
                 pageNumber = int(optionsPageNumber)
             optionsLink = None
@@ -5136,7 +5137,8 @@ class PubServer(BaseHTTPRequestHandler):
                                     toxAddress, jamiAddress,
                                     PGPpubKey, PGPfingerprint,
                                     emailAddress,
-                                    self.server.dormantMonths).encode('utf-8')
+                                    self.server.dormantMonths,
+                                    backToPath).encode('utf-8')
             self._set_headers('text/html', len(msg),
                               cookie, callingDomain)
             self._write(msg)
diff --git a/webapp_person_options.py b/webapp_person_options.py
index 4d845eb2d..77f1d26f8 100644
--- a/webapp_person_options.py
+++ b/webapp_person_options.py
@@ -43,7 +43,8 @@ def htmlPersonOptions(defaultTimeline: str,
                       PGPpubKey: str,
                       PGPfingerprint: str,
                       emailAddress: str,
-                      dormantMonths: int) -> str:
+                      dormantMonths: int,
+                      backToPath: str) -> str:
     """Show options for a person: view/follow/block/report
     """
     optionsDomain, optionsPort = getDomainFromActor(optionsActor)
@@ -225,6 +226,8 @@ def htmlPersonOptions(defaultTimeline: str,
     backPath = '/'
     if nickname:
         backPath = '/users/' + nickname + '/' + defaultTimeline
+        if 'moderation' in backToPath:
+            backPath = '/users/' + nickname + '/moderation'
     optionsStr += \
         '    <a href="' + backPath + '"><button type="button" ' + \
         'class="buttonIcon" name="submitBack">' + translate['Go Back'] + \