diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
index a481adca44..e75bcf12b6 100644
--- a/public/templates/accountedit.tpl
+++ b/public/templates/accountedit.tpl
@@ -50,7 +50,9 @@
 	    	<input id="userPhotoInput" type="file" name="userPhoto" >
 	    </form>
 	    
-	    <span id="status" />
+	    <div id="alert-status" class="alert hide"></div>
+   		<div id="alert-success" class="alert alert-success hide"></div>
+   		<div id="alert-error" class="alert alert-error hide"></div>
    	
 	  </div>
 	  <div class="modal-footer">
@@ -142,12 +144,12 @@ $(document).ready(function() {
         $(this).ajaxSubmit({
  
 			error: function(xhr) {
-				status('Error: ' + xhr.status);
+				error('Error: ' + xhr.status);
 			},
  
 			success: function(response) {
 				if(response.error) {
-					status('Opps, something bad happened');
+					error(response.error);
 					return;
 				}
  
@@ -158,18 +160,38 @@ $(document).ready(function() {
  				
 				$('#user-data-uploadedpicture').html(imageUrlOnServer);        
  								
-	        	$('#upload-picture-modal').modal('hide');
+				setTimeout(function() {
+					hideAlerts();
+		        	$('#upload-picture-modal').modal('hide');
+				}, 750);
 	        	
 				socket.emit('api:updateHeader', { fields: ['username', 'picture'] });
-				status('');
+				success('File uploaded successfully!');
             }
 		});
 
 		return false;
     });
  
+ 	function hideAlerts() {
+ 		$('#alert-status').hide();
+		$('#alert-success').hide();
+		$('#alert-error').hide();
+ 	}
+ 
     function status(message) {
-		$('#status').text(message);
+    	hideAlerts();
+		$('#alert-status').text(message).show();
+    }
+    
+    function success(message) {
+    	hideAlerts();
+		$('#alert-success').text(message).show();
+    }
+    
+    function error(message) {
+    	hideAlerts();
+		$('#alert-error').text(message).show();
     }
 });
 
diff --git a/src/webserver.js b/src/webserver.js
index ac18f782af..f1127cf014 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -205,6 +205,13 @@ var express = require('express'),
 		if(!req.user)
 			return res.redirect('/403');
 		
+		if(req.files.userPhoto.size > 65536) {
+			res.send({
+				error: 'Images must be smaller than 64kb!'
+			});
+			return;
+		}
+		
 		user.getUserField(req.user.uid, 'uploadedpicture', function(uploadedpicture) {
 			
 			var index = uploadedpicture.lastIndexOf('/');
@@ -234,7 +241,7 @@ var express = require('express'),
 			function(error) {
 	            if(error) {
 					res.send({
-	                    error: 'Ah crap! Something bad happened'
+	                    error: 'Error uploading file! Error : '+ JSON.stringify(error)
 					});
 	                return;
 	            }