diff --git a/app/Commands/ParseTrackTagsCommand.php b/app/Commands/ParseTrackTagsCommand.php
index 92b6ddca..6fbfb1d2 100644
--- a/app/Commands/ParseTrackTagsCommand.php
+++ b/app/Commands/ParseTrackTagsCommand.php
@@ -334,6 +334,15 @@ class ParseTrackTagsCommand extends CommandBase
             $trackNumber = $trackNumberComponents[0];
         }
 
+        if (isset($tags['release_date'])) {
+            $releaseDate = $this->parseDateString($tags['release_date'][0]);
+
+        } elseif (isset($tags['creation_date'])) {
+            $releaseDate = $this->parseDateString($tags['creation_date'][0]);
+        } else {
+            $releaseDate = 0;
+        }
+
         return [
             [
                 'title' => isset($tags['title']) ? $tags['title'][0] : null,
@@ -344,7 +353,7 @@ class ParseTrackTagsCommand extends CommandBase
                 'track_number' => $trackNumber,
                 'album' => isset($tags['album']) ? $tags['album'][0] : null,
                 'year' => isset($tags['year']) ? (int) $tags['year'][0] : null,
-                'release_date' => isset($tags['release_date']) ? $this->parseDateString($tags['release_date'][0]) : null,
+                'release_date' => $releaseDate,
                 'comments' => isset($tags['comments']) ? $tags['comments'][0] : null,
                 'lyrics' => isset($tags['lyrics']) ? $tags['lyrics'][0] : null,
             ],
diff --git a/public/templates/uploader/index.html b/public/templates/uploader/index.html
index 65fc7159..21178622 100644
--- a/public/templates/uploader/index.html
+++ b/public/templates/uploader/index.html
@@ -12,7 +12,7 @@
     <p>Contact <a href="mailto:feld0@pony.fm">feld0@pony.fm</a> if you run into any issues!</p>
 
     <ul class="uploads">
-        <li ng-repeat="upload in data.queue track by $index" ng-class="{'uploading': upload.isUploading, 'has-error': upload.error != null, 'is-processing': upload.isProcessing || upload.progress >= 100}" ng-animate="'upload-queue'">
+        <li ng-repeat="upload in data.queue track by $index" ng-class="{'uploading': upload.isUploading, 'has-error': upload.error != null, 'is-processing': upload.isProcessing || (upload.progress >= 100 && upload.error == null)}" ng-animate="'upload-queue'">
             <p>
 
                 <span ng-show="!upload.success">