diff --git a/changelog/70_UNRELEASED_xxxx.xx.xx.md b/changelog/70_UNRELEASED_xxxx.xx.xx.md
index 14ff9095..55bcd8a9 100644
--- a/changelog/70_UNRELEASED_xxxx.xx.xx.md
+++ b/changelog/70_UNRELEASED_xxxx.xx.xx.md
@@ -73,6 +73,7 @@
 ### Userfields
 
 - Product group Userfields are now also rendered on the shopping list
+- Fixed that when having e.g. a Userfield for the `stock` entity and using the "Never overdue" shortcut checkbox for the due date on purchase, this Userfield would also be set to the corresponding "never overdue date"
 
 ### General
 
diff --git a/public/viewjs/userfields.js b/public/viewjs/userfields.js
index 2f6c8d13..4985de29 100644
--- a/public/viewjs/userfields.js
+++ b/public/viewjs/userfields.js
@@ -76,7 +76,7 @@ $(document).on('click', '.userfield-delete-button', function(e)
 	});
 });
 
-if (GetUriParam("entity")
+if (GetUriParam("entity"))
 {
 	$("#entity-filter").val(GetUriParam("entity"));
 	$("#entity-filter").trigger("change");
diff --git a/views/components/userfieldsform.blade.php b/views/components/userfieldsform.blade.php
index 72d7cc35..6d226aa3 100644
--- a/views/components/userfieldsform.blade.php
+++ b/views/components/userfieldsform.blade.php
@@ -56,7 +56,7 @@
 	'value' => ''
 	))
 	@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_DATE)
-	@include('components.datetimepicker', array(
+	@include('components.datetimepicker2', array(
 	'id' => $userfield->name,
 	'label' => $userfield->caption,
 	'noNameAttribute' => true,
@@ -64,13 +64,13 @@
 	'initWithNow' => false,
 	'limitEndToNow' => false,
 	'limitStartToNow' => false,
-	'additionalGroupCssClasses' => 'date-only-datetimepicker',
+	'additionalGroupCssClasses' => 'date-only-datetimepicker2',
 	'isRequired' => $userfield->input_required == 1,
 	'additionalCssClasses' => 'userfield-input',
 	'additionalAttributes' => 'data-userfield-name="' . $userfield->name . '"'
 	))
 	@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_DATETIME)
-	@include('components.datetimepicker', array(
+	@include('components.datetimepicker2', array(
 	'id' => $userfield->name,
 	'label' => $userfield->caption,
 	'noNameAttribute' => true,