diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index dbed804ef60..8684c91078c 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -420,7 +420,7 @@ Discourse.User.reopenClass(Discourse.Singleton, {
     if(Discourse.CDN){
       url = Discourse.CDN + url;
     }
-    return url;
+    return "DISABLED" + url;
   },
 
   /**
diff --git a/config/routes.rb b/config/routes.rb
index ea1056d275e..f9b9ec4ba1e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -212,7 +212,7 @@ Discourse::Application.routes.draw do
   delete "users/:username" => "users#destroy", constraints: {username: USERNAME_ROUTE_FORMAT}
 
   post "user_avatar/:username/refresh_gravatar" => "user_avatars#refresh_gravatar"
-  get "user_avatarX/:username/:size/:version.png" => "user_avatars#show", format: false
+  get "user_avatar/:username/:size/:version.png" => "user_avatars#show", format: false
 
 
   get "uploads/:site/:id/:sha.:extension" => "uploads#show", constraints: {site: /\w+/, id: /\d+/, sha: /[a-z0-9]{15,16}/i, extension: /\w{2,}/}