diff --git a/app/configuration/controllers/firmware-controller.html b/app/configuration/controllers/firmware-controller.html
index 2e5bf25..4d3e2a3 100644
--- a/app/configuration/controllers/firmware-controller.html
+++ b/app/configuration/controllers/firmware-controller.html
@@ -27,6 +27,7 @@
 			</label>
 			<input type="button" value="Upload firmware" class="inline button btn-primary float-right" ng-click="upload()"/>
 			<div class="inline uploading" ng-show="uploading">Upload in progress...</div>
+			<p class="download_success" ng-show="upload_success" role="alert">{{file ? '' : 'Upload complete. Check image tables above.'}}</p>
 		</div>
 		<div class=" column firmware__upload-tftp">
 			<h3 class="h4 bold">Download image file from TFTP server</h3>
diff --git a/app/configuration/controllers/firmware-controller.js b/app/configuration/controllers/firmware-controller.js
index 780bb19..5ebf6ce 100644
--- a/app/configuration/controllers/firmware-controller.js
+++ b/app/configuration/controllers/firmware-controller.js
@@ -48,6 +48,7 @@
                     $scope.confirm_priority = false;
                     $scope.file_empty = true;
                     $scope.uploading = false;
+                    $scope.upload_success = false;
                     $scope.activate = { reboot: true };
                     $scope.download_error_msg = "";
                     $scope.download_success = false;
@@ -151,16 +152,20 @@
                     $scope.upload = function(){
                       if($scope.file) {
                         $scope.uploading = true;
+                        $scope.upload_success = false;
                         APIUtils.uploadImage($scope.file).then(function(response){
+                          $scope.file = "";
                           $scope.uploading = false;
+                          $scope.upload_success = true;
                           $scope.loadFirmwares();
                         }, function(error){
                           $scope.uploading = false;
+                          console.log(error);
                           $scope.displayError({
                             modal_title: 'Error during image upload',
                             title: 'Error during image upload',
-                            desc: 'Error uploading image',
-                            type: 'Error uploading image, please check the image'
+                            desc: error,
+                            type: 'Error'
                           });
                         });
                       }