diff --git a/app.yaml b/app.yaml
index 22215571..6e256abf 100644
--- a/app.yaml
+++ b/app.yaml
@@ -70,6 +70,10 @@ handlers:
   script: activitypub.app
   secure: always
 
+- url: /[^/]+/salmon/?
+  script: salmon.app
+  secure: always
+
 - url: /(acct:)?@[^/]+/?
   script: webfinger.app
   secure: always
diff --git a/salmon.py b/salmon.py
index 0ba109c2..0ac4e88c 100644
--- a/salmon.py
+++ b/salmon.py
@@ -81,5 +81,5 @@ class SlapHandler(webapp2.RequestHandler):
 
 
 app = webapp2.WSGIApplication([
-    (r'/(?:acct)?@%s/salmon' % common.DOMAIN_RE, SlapHandler),
+    (r'/(?:acct:)?@%s/salmon' % common.DOMAIN_RE, SlapHandler),
 ], debug=appengine_config.DEBUG)