diff --git a/app/assets/javascripts/discourse/controllers/preferences_controller.js b/app/assets/javascripts/discourse/controllers/preferences_controller.js
index 3a454035623..61f94b7eed7 100644
--- a/app/assets/javascripts/discourse/controllers/preferences_controller.js
+++ b/app/assets/javascripts/discourse/controllers/preferences_controller.js
@@ -7,6 +7,10 @@
   @module Discourse
 **/
 Discourse.PreferencesController = Discourse.ObjectController.extend({
+  allowAvatarUpload: function() {
+    return Discourse.SiteSetting.allow_uploaded_avatars;
+  }.property(),
+
   // By default we haven't saved anything
   saved: false,
 
diff --git a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
index 9edce0a7839..7e5ccb14c41 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
@@ -49,7 +49,11 @@
       <label class="control-label">{{i18n user.avatar.title}}</label>
       <div class="controls">
         {{boundAvatar model imageSize="large"}}
-        <button {{action showAvatarSelector}} class="btn pad-left"><i class="icon-pencil"></i></button>
+        {{#if allowAvatarUpload}}
+          <button {{action showAvatarSelector}} class="btn pad-left"><i class="icon-pencil"></i></button>
+        {{else}}
+          <a href="//gravatar.com/emails" target="_blank" title="{{i18n user.change_avatar.gravatar_title}}" class="btn"><i class="icon-pencil"></i></a>
+        {{/if}}
       </div>
     </div>