diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js
index 84b0f96ad5..77cbe1008b 100644
--- a/src/controllers/accounts.js
+++ b/src/controllers/accounts.js
@@ -438,7 +438,7 @@ accountsController.uploadPicture = function (req, res, next) {
 
 			user.setUserFields(updateUid, {uploadedpicture: image.url, picture: image.url});
 
-			res.json([{name: userPhoto.name, url: image.url}]);
+			res.json([{name: userPhoto.name, url: nconf.get('relative_path') + image.url}]);
 		}
 
 		if (err) {
diff --git a/src/user.js b/src/user.js
index bd781432a0..035933154a 100644
--- a/src/user.js
+++ b/src/user.js
@@ -119,7 +119,7 @@ var	async = require('async'),
 
 			if (user.picture) {
 				if (user.picture === user.uploadedpicture) {
-					user.picture = user.picture.indexOf('http') === -1 ? nconf.get('relative_path') + user.picture : user.picture;
+					user.picture = user.uploadedpicture = user.picture.indexOf('http') === -1 ? nconf.get('relative_path') + user.picture : user.picture;
 				} else {
 					user.picture = User.createGravatarURLFromEmail(user.email);
 				}