diff --git a/bower.json b/bower.json
index 9738f46d4c..ab28fd9f5d 100644
--- a/bower.json
+++ b/bower.json
@@ -13,7 +13,7 @@
     "angular-ui-router": "~0.2.18",
     "bootstrap": "~3.3.6",
     "ng-file-upload": "^12.1.0",
-    "ng-img-crop": "ngImgCrop#^0.3.2",
+    "ng-img-crop-full-extended": "ngImgCropFullExtended#~6.0.1",
     "owasp-password-strength-test": "~1.3.0"
   },
   "overrides": {
diff --git a/config/assets/default.js b/config/assets/default.js
index 7d4fdca421..3cdad08b89 100644
--- a/config/assets/default.js
+++ b/config/assets/default.js
@@ -9,7 +9,7 @@ module.exports = {
         // bower:css
         'public/lib/bootstrap/dist/css/bootstrap.css',
         'public/lib/bootstrap/dist/css/bootstrap-theme.css',
-        'public/lib/ng-img-crop/compile/unminified/ng-img-crop.css'
+        'public/lib/ng-img-crop-full-extended/compile/minified/ng-img-crop.css'
         // endbower
       ],
       js: [
@@ -18,7 +18,7 @@ module.exports = {
         'public/lib/angular-animate/angular-animate.js',
         'public/lib/angular-bootstrap/ui-bootstrap-tpls.js',
         'public/lib/ng-file-upload/ng-file-upload.js',
-        'public/lib/ng-img-crop/compile/unminified/ng-img-crop.js',
+        'public/lib/ng-img-crop-full-extended/compile/minified/ng-img-crop.js',
         'public/lib/angular-messages/angular-messages.js',
         'public/lib/angular-mocks/angular-mocks.js',
         'public/lib/angular-resource/angular-resource.js',
diff --git a/config/env/test.js b/config/env/test.js
index d8b0e80a2a..598a4b581c 100644
--- a/config/env/test.js
+++ b/config/env/test.js
@@ -28,6 +28,14 @@ module.exports = {
   app: {
     title: defaultEnvConfig.app.title + ' - Test Environment'
   },
+  uploads: {
+    profileUpload: {
+      dest: './modules/users/client/img/profile/uploads/', // Profile upload destination path
+      limits: {
+        fileSize: 100000 // Limit filesize (100kb) for testing purposes
+      }
+    }
+  },
   facebook: {
     clientID: process.env.FACEBOOK_ID || 'APP_ID',
     clientSecret: process.env.FACEBOOK_SECRET || 'APP_SECRET',
diff --git a/config/lib/multer.js b/config/lib/multer.js
index 960ffcb443..81c4ca38f7 100644
--- a/config/lib/multer.js
+++ b/config/lib/multer.js
@@ -1,8 +1,10 @@
 'use strict';
 
-module.exports.profileUploadFileFilter = function (req, file, cb) {
+module.exports.profileUploadFileFilter = function (req, file, callback) {
   if (file.mimetype !== 'image/png' && file.mimetype !== 'image/jpg' && file.mimetype !== 'image/jpeg' && file.mimetype !== 'image/gif') {
-    return cb(new Error('Only image files are allowed!'), false);
+    var err = new Error();
+    err.code = 'UNSUPPORTED_MEDIA_TYPE';
+    return callback(err, false);
   }
-  cb(null, true);
+  callback(null, true);
 };
diff --git a/modules/core/server/controllers/errors.server.controller.js b/modules/core/server/controllers/errors.server.controller.js
index c584819dd7..0541b64b94 100644
--- a/modules/core/server/controllers/errors.server.controller.js
+++ b/modules/core/server/controllers/errors.server.controller.js
@@ -45,8 +45,11 @@ exports.getErrorMessage = function (err) {
       case 11001:
         message = getUniqueErrorMessage(err);
         break;
+      case 'UNSUPPORTED_MEDIA_TYPE':
+        message = 'Unsupported filetype';
+        break;
       case 'LIMIT_FILE_SIZE':
-        message = 'Image too big. Please maximum ' + (config.uploads.profileUpload.limits.fileSize / (1024 * 1024)).toFixed(2) + ' Mb files.';
+        message = 'Image too big. The maximum size allowed is ' + (config.uploads.profileUpload.limits.fileSize / (1024 * 1024)).toFixed(2) + ' Mb';
         break;
       case 'LIMIT_UNEXPECTED_FILE':
         message = 'Missing `newProfilePicture` field';
diff --git a/modules/users/client/controllers/settings/change-profile-picture.client.controller.js b/modules/users/client/controllers/settings/change-profile-picture.client.controller.js
index 411b62a14e..58be6e31b8 100644
--- a/modules/users/client/controllers/settings/change-profile-picture.client.controller.js
+++ b/modules/users/client/controllers/settings/change-profile-picture.client.controller.js
@@ -11,7 +11,6 @@
     var vm = this;
 
     vm.user = Authentication.user;
-    vm.fileSelected = false;
 
     vm.upload = function (dataUrl, name) {
       vm.success = vm.error = null;
@@ -32,6 +31,14 @@
       });
     };
 
+    // Called after the user has selected any file and it's been cropped
+    vm.onFileSelection = function() {
+      vm.success = vm.error = vm.nowResizing = vm.pictureSelected = null;
+
+      // proceed to crop if they didn't cancel and it's a valid image file
+      if (vm.picFile && !vm.userForm.$error.pattern) vm.pictureSelected = true;
+    };
+
     // Called after the user has successfully uploaded a new picture
     function onSuccessItem(response) {
       // Show success message
@@ -41,13 +48,13 @@
       vm.user = Authentication.user = response;
 
       // Reset form
-      vm.fileSelected = false;
+      vm.pictureSelected = false;
       vm.progress = 0;
     }
 
     // Called after the user has failed to uploaded a new picture
     function onErrorItem(response) {
-      vm.fileSelected = false;
+      vm.pictureSelected = false;
 
       // Show error message
       vm.error = response.message;
diff --git a/modules/users/client/css/users.css b/modules/users/client/css/users.css
index cd0141635b..a841183877 100644
--- a/modules/users/client/css/users.css
+++ b/modules/users/client/css/users.css
@@ -38,6 +38,7 @@
     background: #E4E4E4;
     width: 300px;
     height: 300px;
+    margin: 0 auto;
 }
 
 .social {
diff --git a/modules/users/client/views/settings/change-profile-picture.client.view.html b/modules/users/client/views/settings/change-profile-picture.client.view.html
index 721c34bb46..7ee227bdf2 100644
--- a/modules/users/client/views/settings/change-profile-picture.client.view.html
+++ b/modules/users/client/views/settings/change-profile-picture.client.view.html
@@ -1,24 +1,30 @@
 <section class="row">
-  <div class="col-xs-offset-1 col-xs-10 col-md-offset-3 col-md-4">
-    <form class="signin form-horizontal">
+  <div class="col-xs-12 col-md-offset-3 col-md-5">
+    <form name="vm.userForm" class="signin form-horizontal">
       <fieldset>
-        <div ng-show="vm.fileSelected" class="text-center form-group">
-          <p>Crop your picture then press upload below:</p>
-          <div ngf-drop ng-model="picFile" ngf-pattern="image/*" class="cropArea">
-            <img-crop image="picFile | ngfDataUrl" result-image="croppedDataUrl" ng-init="croppedDataUrl=''"></img-crop>
+        <div ng-show="vm.nowResizing" class="text-center">
+          <p><span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span> Preparing for cropping...</p>
+        </div>
+        <div ng-show="vm.pictureSelected" class="text-center">
+          <p>Crop your picture then press upload below</p>
+          <div class="cropArea">
+            <img-crop image="vm.picFile | ngfDataUrl" result-image="croppedDataUrl" ng-init="croppedDataUrl=''" chargement="'Loading'"></img-crop>
           </div>
         </div>
         <div class="form-group text-center">
-          <img ng-src="{{vm.fileSelected ? croppedDataUrl : vm.user.profileImageURL}}" alt="{{vm.user.displayName}}" class="img-thumbnail user-profile-picture" ngf-drop>
+          <img ng-src="{{vm.pictureSelected ? croppedDataUrl : vm.user.profileImageURL}}" alt="{{vm.user.displayName}}" class="img-thumbnail user-profile-picture">
+        </div>
+        <div ng-show="vm.userForm.$error.pattern" class="text-center text-danger">
+          <strong>You may only select an image file</strong>
         </div>
-        <div ng-show="!vm.fileSelected" class="text-center form-group">
-          <button class="btn btn-default btn-file" ngf-select="vm.fileSelected = true; vm.success = null" ng-model="picFile" accept="image/*">Select Picture</button>
+        <div ng-show="!vm.pictureSelected" class="text-center form-group">
+          <button class="btn btn-default btn-file" ngf-select="vm.onFileSelection()" ng-model="vm.picFile" ngf-pattern="'image/*'" accept="image/*" ngf-resize="{ width:700, height:700 }" ngf-before-model-change="vm.nowResizing = true">Select Picture</button>
         </div>
-        <div ng-show="vm.fileSelected" class="text-center form-group">
-          <button class="btn btn-primary" ng-click="vm.upload(croppedDataUrl, picFile.name)">Upload</button>
-          <button class="btn btn-default" ng-click="vm.fileSelected = false">Cancel</button>
+        <div ng-show="vm.pictureSelected" class="text-center form-group">
+          <button class="btn btn-primary" ng-click="vm.upload(croppedDataUrl, vm.picFile.name)">Upload</button>
+          <button class="btn btn-default" ng-click="vm.pictureSelected = false">Cancel</button>
         </div>
-        <div ng-show="vm.fileSelected" class="progress text-center">
+        <div ng-show="vm.pictureSelected" class="progress text-center">
           <div class="progress-bar" role="progressbar" aria-valuenow="{{vm.progress}}" aria-valuemin="0" aria-valuemax="100" style="width:{{vm.progress}}%" ng-bind="vm.progress + '%'">
             <span class="sr-only">{{vm.progress}}% Complete</span>
           </div>
diff --git a/modules/users/server/controllers/users/users.profile.server.controller.js b/modules/users/server/controllers/users/users.profile.server.controller.js
index 7f32894d55..a2f4c65b15 100644
--- a/modules/users/server/controllers/users/users.profile.server.controller.js
+++ b/modules/users/server/controllers/users/users.profile.server.controller.js
@@ -55,12 +55,12 @@ exports.update = function (req, res) {
  */
 exports.changeProfilePicture = function (req, res) {
   var user = req.user;
-  var upload = multer(config.uploads.profileUpload).single('newProfilePicture');
-  var profileUploadFileFilter = require(path.resolve('./config/lib/multer')).profileUploadFileFilter;
   var existingImageUrl;
 
   // Filtering to upload only images
-  upload.fileFilter = profileUploadFileFilter;
+  var multerConfig = config.uploads.profileUpload;
+  multerConfig.fileFilter = require(path.resolve('./config/lib/multer')).profileUploadFileFilter;
+  var upload = multer(multerConfig).single('newProfilePicture');
 
   if (user) {
     existingImageUrl = user.profileImageURL;
diff --git a/modules/users/tests/server/img/text-file.txt b/modules/users/tests/server/img/text-file.txt
new file mode 100644
index 0000000000..f648b25ce2
--- /dev/null
+++ b/modules/users/tests/server/img/text-file.txt
@@ -0,0 +1 @@
+Should not be able to upload this as a profile picture!
diff --git a/modules/users/tests/server/img/too-big-file.png b/modules/users/tests/server/img/too-big-file.png
new file mode 100644
index 0000000000..b2f52173ed
Binary files /dev/null and b/modules/users/tests/server/img/too-big-file.png differ
diff --git a/modules/users/tests/server/user.server.routes.tests.js b/modules/users/tests/server/user.server.routes.tests.js
index 9d0da694f1..86216b47e4 100644
--- a/modules/users/tests/server/user.server.routes.tests.js
+++ b/modules/users/tests/server/user.server.routes.tests.js
@@ -930,6 +930,46 @@ describe('User CRUD tests', function () {
       });
   });
 
+  it('should not be able to upload a non-image file as a profile picture', function (done) {
+    agent.post('/api/auth/signin')
+      .send(credentials)
+      .expect(200)
+      .end(function (signinErr, signinRes) {
+        // Handle signin error
+        if (signinErr) {
+          return done(signinErr);
+        }
+
+        agent.post('/api/users/picture')
+          .attach('newProfilePicture', './modules/users/tests/server/img/text-file.txt')
+          .send(credentials)
+          .expect(400)
+          .end(function (userInfoErr, userInfoRes) {
+            done(userInfoErr);
+          });
+      });
+  });
+
+  it('should not be able to change profile picture to too big of a file', function (done) {
+    agent.post('/api/auth/signin')
+      .send(credentials)
+      .expect(200)
+      .end(function (signinErr) {
+        // Handle signin error
+        if (signinErr) {
+          return done(signinErr);
+        }
+
+        agent.post('/api/users/picture')
+          .attach('newProfilePicture', './modules/users/tests/server/img/too-big-file.png')
+          .send(credentials)
+          .expect(400)
+          .end(function (userInfoErr, userInfoRes) {
+            done(userInfoErr);
+          });
+      });
+  });
+
   it('should not be able to change profile picture if attach a picture with a different field name', function (done) {
     agent.post('/api/auth/signin')
       .send(credentials)