diff --git a/public/language/en_GB/user.json b/public/language/en_GB/user.json
index 210d9da4d9..332653ac3b 100644
--- a/public/language/en_GB/user.json
+++ b/public/language/en_GB/user.json
@@ -30,7 +30,8 @@
 
 	"upload_picture": "Upload picture",
 	"upload_a_picture": "Upload a picture",
-	"image_spec": "You may only upload PNG, JPG, or GIF files under 256kb.",
+	"image_spec": "You may only upload PNG, JPG, or GIF files",
+	"max": "max.",
 
 	"settings": "Settings",
 	"show_email": "Show My Email",
diff --git a/public/src/forum/accountedit.js b/public/src/forum/accountedit.js
index b33d8f2d4a..b9570fce7d 100644
--- a/public/src/forum/accountedit.js
+++ b/public/src/forum/accountedit.js
@@ -113,7 +113,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
 		$('#uploadPictureBtn').on('click', function() {
 
 			$('#change-picture-modal').modal('hide');
-			uploader.open(RELATIVE_PATH + '/user/uploadpicture', {}, function(imageUrlOnServer) {
+			uploader.open(RELATIVE_PATH + '/user/uploadpicture', {}, config.maximumProfileImageSize, function(imageUrlOnServer) {
 				imageUrlOnServer = imageUrlOnServer + '?' + new Date().getTime();
 
 				$('#user-current-picture').attr('src', imageUrlOnServer);
diff --git a/public/src/forum/admin/categories.js b/public/src/forum/admin/categories.js
index c7e57dd26b..5ac78f7183 100644
--- a/public/src/forum/admin/categories.js
+++ b/public/src/forum/admin/categories.js
@@ -187,7 +187,7 @@ define(['uploader'], function(uploader) {
 			$('.admin-categories').on('click', '.upload-button', function() {
 				var inputEl = this;
 				var	cid = $(this).parents('li[data-cid]').attr('data-cid');
-				uploader.open(RELATIVE_PATH + '/admin/category/uploadpicture', {cid:cid}, function(imageUrlOnServer) {
+				uploader.open(RELATIVE_PATH + '/admin/category/uploadpicture', {cid:cid}, 0, function(imageUrlOnServer) {
 					inputEl.value = imageUrlOnServer;
 					var previewBox = $(inputEl).parents('li[data-cid]').find('.preview-box');
 					previewBox.css('background', 'url(' + imageUrlOnServer + '?' + new Date().getTime() + ')')
diff --git a/public/src/forum/admin/settings.js b/public/src/forum/admin/settings.js
index 6fec309ead..c70dcc0828 100644
--- a/public/src/forum/admin/settings.js
+++ b/public/src/forum/admin/settings.js
@@ -97,7 +97,7 @@ define(['uploader'], function(uploader) {
 		});
 
 		$('#uploadLogoBtn').on('click', function() {
-			uploader.open(RELATIVE_PATH + '/admin/uploadlogo', {}, function(image) {
+			uploader.open(RELATIVE_PATH + '/admin/uploadlogo', {}, 0, function(image) {
 				$('#logoUrl').val(image);
 			});
 
@@ -105,7 +105,7 @@ define(['uploader'], function(uploader) {
 		});
 
 		$('#uploadFaviconBtn').on('click', function() {
-			uploader.open(RELATIVE_PATH + '/admin/uploadfavicon', {}, function(icon) {
+			uploader.open(RELATIVE_PATH + '/admin/uploadfavicon', {}, 0, function(icon) {
 				$('#faviconUrl').val(icon);
 			});
 
diff --git a/public/src/modules/uploader.js b/public/src/modules/uploader.js
index dd51395de2..c82073c17a 100644
--- a/public/src/modules/uploader.js
+++ b/public/src/modules/uploader.js
@@ -2,13 +2,20 @@ define(function() {
 
 	var module = {};
 
-	module.open = function(route, params, callback) {
+	module.open = function(route, params, fileSize, callback) {
 		$('#upload-picture-modal').modal('show').removeClass('hide');
 		module.hideAlerts();
-
-		$('#uploadForm')[0].reset();
-		$('#uploadForm').attr('action', route);
-		$('#uploadForm').find('#params').val(JSON.stringify(params));
+		var uploadForm = $('#uploadForm');
+		uploadForm[0].reset();
+		uploadForm.attr('action', route);
+		uploadForm.find('#params').val(JSON.stringify(params));
+
+		if(fileSize) {
+			uploadForm.find('#upload-file-size').html(fileSize);
+			uploadForm.find('#file-size-block').removeClass('hide');
+		} else {
+			uploadForm.find('#file-size-block').addClass('hide');
+		}
 
 		$('#pictureUploadSubmitBtn').off('click').on('click', function() {
 			$('#uploadForm').submit();
diff --git a/public/templates/admin/footer.tpl b/public/templates/admin/footer.tpl
index 6e67767f4c..c8fdc1117c 100644
--- a/public/templates/admin/footer.tpl
+++ b/public/templates/admin/footer.tpl
@@ -14,7 +14,7 @@
 						<div class="form-group">
 							<label for="userPhoto">Upload a picture</label>
 							<input type="file" id="userPhotoInput"  name="userPhoto">
-							<p class="help-block">You may only upload PNG, JPG, or GIF files under 256kb.</p>
+							<p class="help-block"></p>
 						</div>
 						<input id="imageUploadCsrf" type="hidden" name="_csrf" value="" />
 						<input type="hidden" id="params" name="params">
diff --git a/public/templates/footer.tpl b/public/templates/footer.tpl
index c8646bc4a3..608829f281 100644
--- a/public/templates/footer.tpl
+++ b/public/templates/footer.tpl
@@ -14,7 +14,7 @@
 						<div class="form-group">
 							<label for="userPhoto">[[user:upload_a_picture]]</label>
 							<input type="file" id="userPhotoInput"  name="userPhoto">
-							<p class="help-block">[[user:image_spec]]</p>
+							<p class="help-block">[[user:image_spec]] <span id="file-size-block" class="hide"> ([[user:max]] <span id="upload-file-size"></span> kbs.)</span></p>
 						</div>
 						<input id="imageUploadCsrf" type="hidden" name="_csrf" value="" />
 						<input type="hidden" id="params" name="params">
diff --git a/src/routes/api.js b/src/routes/api.js
index 9c6f9dc7ed..a153c9b26f 100644
--- a/src/routes/api.js
+++ b/src/routes/api.js
@@ -38,6 +38,7 @@ var path = require('path'),
 				config.maximumTitleLength = meta.config.maximumTitleLength;
 				config.minimumPostLength = meta.config.minimumPostLength;
 				config.hasImageUploadPlugin = Plugins.hasListeners('filter:uploadImage');
+				config.maximumProfileImageSize = meta.config.maximumProfileImageSize;
 				config.minimumUsernameLength = meta.config.minimumUsernameLength;
 				config.maximumUsernameLength = meta.config.maximumUsernameLength;
 				config.minimumPasswordLength = meta.config.minimumPasswordLength;