diff --git a/common/views.py b/common/views.py
index c2141c02..bf4b056e 100644
--- a/common/views.py
+++ b/common/views.py
@@ -34,7 +34,7 @@ def home(request):
def ap_redirect(request, uri):
- return redirect(request.get_full_path().replace("~neodb~", "/"))
+ return redirect(request.get_full_path().replace("/~neodb~/", "/"))
def nodeinfo2(request):
diff --git a/users/templates/users/profile_actions.html b/users/templates/users/profile_actions.html
index a439f3ab..14401372 100644
--- a/users/templates/users/profile_actions.html
+++ b/users/templates/users/profile_actions.html
@@ -48,14 +48,16 @@
{% endif %}
{% if identity.user.mastodon_account %}
-
-
-
-
-
+ {% if not identity.locked or request.user.is_superuser or relationship.requested or relationship.status %}
+
+
+
+
+
+ {% endif %}
{% endif %}
{% endif %}
{% if relationship.requested %}