diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py
index 22666a3a..4cab06c5 100644
--- a/ereuse_devicehub/inventory/forms.py
+++ b/ereuse_devicehub/inventory/forms.py
@@ -622,7 +622,7 @@ class NewDeviceForm(FlaskForm):
 
         if self.type.data in ['HardDrive', 'SolidStateDrive']:
             if self.data_storage_size.data:
-                self._obj.size = self.data_storage_size.data * 1000
+                device.size = self.data_storage_size.data * 1000
 
         device.image = URL(self.image.data)
 
diff --git a/ereuse_devicehub/templates/inventory/upload_placeholder.html b/ereuse_devicehub/templates/inventory/upload_placeholder.html
index 6291589d..7763cd43 100644
--- a/ereuse_devicehub/templates/inventory/upload_placeholder.html
+++ b/ereuse_devicehub/templates/inventory/upload_placeholder.html
@@ -56,6 +56,12 @@
                         <option value="Cellphone"
                         {% if form.type.data == 'Cellphone' %} selected="selected"{% endif %}>Cellphone</option>
                       </optgroup>
+                      <optgroup label="Data Storage">
+                        <option value="HardDrive"
+                        {% if form.type.data == 'HardDrive' %} selected="selected"{% endif %}>HardDrive</option>
+                        <option value="SolidStateDrive"
+                        {% if form.type.data == 'SolidStateDrive' %} selected="selected"{% endif %}>SolidStateDrive</option>
+                      </optgroup>
                       <optgroup label="Computer Accessory">
                         <option value="Mouse"
                         {% if form.type.data == 'Mouse' %} selected="selected"{% endif %}>Mouse</option>