diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
index 0187be422..3405372ee 100644
--- a/app/models/site_setting.rb
+++ b/app/models/site_setting.rb
@@ -242,6 +242,7 @@ class SiteSetting < ActiveRecord::Base
 
   setting(:username_change_period, 3) # days
 
+  client_setting(:allow_uploaded_avatars, false)
 
   def self.generate_api_key!
     self.api_key = SecureRandom.hex(32)
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 190192c58..6662beb41 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -665,6 +665,8 @@ en:
     delete_all_posts_max: "The maximum number of posts that can be deleted at once with the Delete All Posts button. If a user has more than this many posts, the posts cannot all be deleted at once and the user can't be deleted."
     username_change_period: "The number of days after registration that accounts can change their username."
 
+    allow_uploaded_avatars: "Allow support for uploaded avatars"
+
   notification_types:
     mentioned: "%{display_username} mentioned you in %{link}"
     liked: "%{display_username} liked your post in %{link}"
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index e9ceb9320..cbb51c49c 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -613,6 +613,8 @@ fr:
 
     minimum_topics_similar: "Combien de topics ont besoin d'exister dans la base de données avant que des topics similaires soit présentés."
 
+    allow_uploaded_avatars: "Permet aux utilisateurs d'uploader leur propre avatar"
+
   notification_types:
     mentioned: "%{display_username} vous a mentionné dans %{link}"
     liked: "%{display_username} a aimé votre message dans %{link}"