diff --git a/src/controllers/accounts/edit.js b/src/controllers/accounts/edit.js
index 09e824ecd9..2ae429b248 100644
--- a/src/controllers/accounts/edit.js
+++ b/src/controllers/accounts/edit.js
@@ -126,7 +126,9 @@ editController.uploadPicture = function (req, res, next) {
 		}
 	], function(err, image) {
 		fs.unlink(userPhoto.path, function(err) {
-			winston.error('unable to delete picture ' + userPhoto.path, err);
+			if (err) {
+				winston.warn('[user/picture] Unable to delete picture ' + userPhoto.path, err);
+			}
 		});
 		if (err) {
 			return next(err);
diff --git a/src/views/admin/settings/uploads.tpl b/src/views/admin/settings/uploads.tpl
index 76b053332b..4881f8dcd7 100644
--- a/src/views/admin/settings/uploads.tpl
+++ b/src/views/admin/settings/uploads.tpl
@@ -91,16 +91,25 @@
 			<div class="form-group">
 				<label for="profileImageDimension">Profile Image Dimension</label>
 				<input id="profileImageDimension" type="text" class="form-control" data-field="profileImageDimension" placeholder="128" />
+				<p class="help-block">
+					(in pixels, default: 128 pixels)
+				</p>
 			</div>
 
 			<div class="form-group">
 				<label>Maximum Profile Image File Size</label>
 				<input type="text" class="form-control" placeholder="Maximum size of uploaded user images in kilobytes" data-field="maximumProfileImageSize" />
+				<p class="help-block">
+					(in kilobytes, default: 256 KiB)
+				</p>
 			</div>
 
 			<div class="form-group">
 				<label>Maximum Cover Image File Size</label>
 				<input type="text" class="form-control" placeholder="Maximum size of uploaded cover images in kilobytes" data-field="maximumCoverImageSize" />
+				<p class="help-block">
+					(in kilobytes, default: 2,048 KiB)
+				</p>
 			</div>
 		</form>
 	</div>