diff --git a/nginx.conf b/nginx.conf
index d51fb8f..6e0182f 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -51,10 +51,10 @@ http {
       }
 
       # gpg --locate-key <EMAIL>
-      if ($args ~* "^op=get&options=mr&?search=(..)([^&]*)@([^&]*)") {
+      if ($args ~* "^op=get&options=mr&?search=(..)([^&]*)(@|%40)([^&]*)") {
         set $dir $1;
         set $local $2;
-        set $horst $3;
+        set $horst $4;
         rewrite . /by-email/$dir/$local%40$horst;
       }