diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py
index 37accbe6..41505a8a 100644
--- a/ereuse_devicehub/inventory/forms.py
+++ b/ereuse_devicehub/inventory/forms.py
@@ -349,7 +349,7 @@ class NewDeviceForm(FlaskForm):
     depth = FloatField('Depth', [validators.Optional()])
     variant = StringField('Variant', [validators.Optional()])
     sku = StringField('SKU', [validators.Optional()])
-    image = StringField('Image', [validators.Optional(), validators.URL()])
+    image = URLField('Image', [validators.Optional(), validators.URL()])
     imei = IntegerField('IMEI', [validators.Optional()])
     meid = StringField('MEID', [validators.Optional()])
     resolution = IntegerField('Resolution width', [validators.Optional()])
@@ -409,7 +409,8 @@ class NewDeviceForm(FlaskForm):
         self.depth.data = self._obj.depth
         self.variant.data = self._obj.variant
         self.sku.data = self._obj.sku
-        self.image.data = self._obj.image
+        if self._obj.image:
+            self.image.data = self._obj.image.to_text()
         if self._obj.type in ['Smartphone', 'Tablet', 'Cellphone']:
             self.imei.data = self._obj.imei
             self.meid.data = self._obj.meid
@@ -555,6 +556,8 @@ class NewDeviceForm(FlaskForm):
             device.imei = self.imei.data
             device.meid = self.meid.data
 
+        device.image = URL(self.image.data)
+
         device.placeholder = self.get_placeholder()
         db.session.add(device)
 
@@ -610,7 +613,7 @@ class NewDeviceForm(FlaskForm):
             self._obj.height = self.height.data
             self._obj.depth = self.depth.data
             self._obj.variant = self.variant.data
-            self._obj.image = self.image.data
+            self._obj.image = URL(self.image.data)
 
             if self._obj.type == 'ComputerMonitor':
                 self._obj.resolution_width = self.resolution.data
diff --git a/tests/test_render_2_0.py b/tests/test_render_2_0.py
index d6ac6a6e..6cca84f5 100644
--- a/tests/test_render_2_0.py
+++ b/tests/test_render_2_0.py
@@ -2174,6 +2174,7 @@ def test_manual_binding(user3: UserClientFlask):
 @pytest.mark.mvp
 @pytest.mark.usefixtures(conftest.app_context.__name__)
 def test_edit_and_binding(user3: UserClientFlask):
+    # TODO
     uri = '/inventory/device/add/'
     user3.get(uri)