diff --git a/public/less/generics.less b/public/less/generics.less
index 0725264501..5193627445 100644
--- a/public/less/generics.less
+++ b/public/less/generics.less
@@ -132,7 +132,7 @@
 }
 
 #crop-picture-modal {
-	.cropped-image {
+	#cropped-image {
 		max-width: 100%;
 	}
 	
diff --git a/public/src/client/account/edit.js b/public/src/client/account/edit.js
index 752499f34f..2856d10f99 100644
--- a/public/src/client/account/edit.js
+++ b/public/src/client/account/edit.js
@@ -252,6 +252,9 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator',
 							imageData: imageData
 						}, function (err, imageData) {
 							if (err) {
+								cropperModal.find('#upload-progress-box').hide();
+								cropperModal.find('.upload-btn').removeClass('disabled');
+								cropperModal.find('.crop-btn').removeClass('disabled');
 								app.alertError(err.message);
 							}
 							
@@ -259,6 +262,18 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator',
 							cropperModal.modal('hide');
 						});
 					});
+					
+					cropperModal.find('.upload-btn').on('click', function () {
+						$(this).addClass('disabled');
+						cropperTool.destroy();
+					
+						cropperTool = new cropper.default(img, {
+							viewMode: 1,
+							autoCropArea: 1
+						});
+					
+						cropperModal.find('.crop-btn').trigger('click');
+					});
 				});
 			});
 		}
diff --git a/src/views/modals/crop_picture.tpl b/src/views/modals/crop_picture.tpl
index d28a3a2d59..ba98860df4 100644
--- a/src/views/modals/crop_picture.tpl
+++ b/src/views/modals/crop_picture.tpl
@@ -32,6 +32,7 @@
  				</div>
 				<div class="modal-footer">
 					<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
+					<button class="btn btn-primary upload-btn">[[user:upload_picture]]</button>
 					<button class="btn btn-primary crop-btn">[[user:upload_cropped_picture]]</button>
 				</div>
 			</div>