diff --git a/DiscImageChef.Server/Areas/Admin/Controllers/ReportsController.cs b/DiscImageChef.Server/Areas/Admin/Controllers/ReportsController.cs
index cbbe0620..d0159a4d 100644
--- a/DiscImageChef.Server/Areas/Admin/Controllers/ReportsController.cs
+++ b/DiscImageChef.Server/Areas/Admin/Controllers/ReportsController.cs
@@ -60,36 +60,33 @@ namespace DiscImageChef.Server.Areas.Admin.Controllers
         // To protect from overposting attacks, please enable the specific properties you want to bind to, for
         // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
         [HttpPost, ValidateAntiForgeryToken]
-        public async Task<IActionResult> Edit(
-            int id, [Bind("UploadedWhen,Id,CompactFlash,Manufacturer,Model,Revision,Type")]
-            UploadedReport uploadedReport)
+        public async Task<IActionResult> Edit(int id, [Bind("Id,CompactFlash,Manufacturer,Model,Revision,Type")]
+                                              UploadedReport uploadedReport)
         {
             if(id != uploadedReport.Id)
             {
                 return NotFound();
             }
 
-            if(ModelState.IsValid)
+            if(!ModelState.IsValid)
+                return View(uploadedReport);
+
+            try
             {
-                try
+                _context.Update(uploadedReport);
+                await _context.SaveChangesAsync();
+            }
+            catch(DbUpdateConcurrencyException)
+            {
+                if(!UploadedReportExists(uploadedReport.Id))
                 {
-                    _context.Update(uploadedReport);
-                    await _context.SaveChangesAsync();
-                }
-                catch(DbUpdateConcurrencyException)
-                {
-                    if(!UploadedReportExists(uploadedReport.Id))
-                    {
-                        return NotFound();
-                    }
-
-                    throw;
+                    return NotFound();
                 }
 
-                return RedirectToAction(nameof(Index));
+                throw;
             }
 
-            return View(uploadedReport);
+            return RedirectToAction(nameof(Index));
         }
 
         // GET: Admin/Reports/Delete/5
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Reports/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Reports/Edit.cshtml
index b3873f84..3b7d15cb 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Reports/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Reports/Edit.cshtml
@@ -1,26 +1,17 @@
+@using DiscImageChef.CommonTypes.Enums
 @model UploadedReport
 
 @{
     ViewData["Title"] = "Edit";
 }
 <h1>Edit</h1>
-<h4>UploadedReport</h4>
+<h4>Uploaded report</h4>
 <hr />
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <div class="form-group">
-                <label asp-for="UploadedWhen" class="control-label"></label>
-                <input asp-for="UploadedWhen" class="form-control" />
-                <span asp-validation-for="UploadedWhen" class="text-danger"></span>
-            </div>
             <input type="hidden" asp-for="Id" />
-            <div class="form-check form-group">
-                <label class="form-check-label">
-                    <input class="form-check-input" asp-for="CompactFlash" /> @Html.DisplayNameFor(model => model.CompactFlash)
-                </label>
-            </div>
             <div class="form-group">
                 <label asp-for="Manufacturer" class="control-label"></label>
                 <input asp-for="Manufacturer" class="form-control" />
@@ -36,9 +27,14 @@
                 <input asp-for="Revision" class="form-control" />
                 <span asp-validation-for="Revision" class="text-danger"></span>
             </div>
+            <div class="form-check form-group">
+                <label class="form-check-label">
+                    <input class="form-check-input" asp-for="CompactFlash" /> @Html.DisplayNameFor(model => model.CompactFlash)
+                </label>
+            </div>
             <div class="form-group">
                 <label asp-for="Type" class="control-label"></label>
-                <select asp-for="Type" class="form-control"></select>
+                <select asp-for="Type" class="form-control" asp-items="Html.GetEnumSelectList<DeviceType>()"></select>
                 <span asp-validation-for="Type" class="text-danger"></span>
             </div>
             <div class="form-group">