diff --git a/controllers/sign.js b/controllers/sign.js
index 6b21db5..c488d40 100644
--- a/controllers/sign.js
+++ b/controllers/sign.js
@@ -278,7 +278,7 @@ exports.auth_user = function (req, res, next) {
       return next();
     }
     res.locals.current_user = req.session.user = user;
-    req.session.user.avatar_url = User.makeGravatar(user.email);
+    req.session.user.avatar_url = User.getGravatar(user.email);
 
     if (config.admins.hasOwnProperty(user.name)) {
       user.is_admin = true;
diff --git a/proxy/user.js b/proxy/user.js
index 1f2f7f7..86099e6 100644
--- a/proxy/user.js
+++ b/proxy/user.js
@@ -114,6 +114,11 @@ exports.newAndSave = function (name, loginname, pass, email, avatar_url, active,
   user.save(callback);
 };
 
-exports.makeGravatar = function (email) {
+var makeGravatar = function (email) {
   return 'http://www.gravatar.com/avatar/' + utility.md5(email.toLowerCase()) + '?size=48';
 };
+exports.makeGravatar = makeGravatar;
+
+exports.getGravatar = function (user) {
+  return user.avatar || makeGravatar(user.email);
+};