diff --git a/src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java b/src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java
index ab0e36d..d178c9a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java
@@ -33,9 +33,6 @@
 @Singleton
 public class ExternalUrlAvatarProvider implements AvatarProvider {
 
-  private static final String USER_PLACEHOLDER = "${user}";
-  private static final String EMAIL_PLACEHOLDER = "${email}";
-
   private final String pluginName;
   private final boolean ssl;
   private String externalAvatarUrl;
@@ -131,9 +128,9 @@
    * @return filled in string
    */
   private String fillOutTemplate(String template, IdentifiedUser user) {
-    String workString = replaceInUrl(USER_PLACEHOLDER,
+    String workString = replaceInUrl("${user}",
         template, user.getUserName().orElse(null));
-    return replaceInUrl(EMAIL_PLACEHOLDER, workString,
+    return replaceInUrl("${email}", workString,
         user.getAccount().preferredEmail());
   }
 }
