diff --git a/application/controllers/admin/dataentry.php b/application/controllers/admin/dataentry.php
index 9895e4fb66f..8df96faf3b1 100644
--- a/application/controllers/admin/dataentry.php
+++ b/application/controllers/admin/dataentry.php
@@ -733,7 +733,6 @@ public function editdata($subaction, $id, $surveyid, $language='')
                                 /*
                                 $aDataentryoutput .= Yii::app()->getController()->widget('yiiwheels.widgets.daterangepicker.WhDateRangePicker', array(
                                     'name' => $fname['fieldname'],
-                                    'id' => 'datestampL',
                                     'value' => $thisdate,
                                     'pluginOptions' => array(
                                         'format' => $dateformatdetails['jsdate'] . " HH:mm",
diff --git a/application/views/admin/dataentry/content_view.php b/application/views/admin/dataentry/content_view.php
index 61413031e99..a1b176a1e03 100644
--- a/application/views/admin/dataentry/content_view.php
+++ b/application/views/admin/dataentry/content_view.php
@@ -55,10 +55,18 @@
                 ?>
             <div class="col-sm-10">
                 <?php if(canShowDatePicker($dateformatdetails)): ?>
-                    <?php
-                    $goodchars = str_replace( array("m","d","y", "H", "M"), "", $dateformatdetails['dateformat']);
-                    $goodchars = "0123456789".$goodchars[0]; ?>
-                    <input type='text' class='popupdate' size='12' name='<?php echo $fieldname; ?>' onkeypress="return goodchars(event,'<?php echo $goodchars; ?>')"/>
+                    <?php Yii::app()->getController()->widget('yiiwheels.widgets.daterangepicker.WhDateRangePicker', array(
+                        'name' => $fieldname,
+                        'pluginOptions' => array(
+                            'format' => $dateformatdetails['jsdate'] . " HH:mm",
+                            'singleDatePicker' => true,
+                            'startDate' => date("Y-m-d", time()),
+                            'drops' => 'up',  // TODO: Does not work. Why?
+                            'timePicker' => true,
+                            'timePicker12Hour' => false,  // NB: timePicker24Hour = true does not work
+                            'timePickerIncrement' => 1
+                        )
+                    )); ?>
                     <input type='hidden' name='dateformat<?php echo $fieldname; ?>' id='dateformat<?php echo $fieldname; ?>' value='<?php echo $dateformatdetails['jsdate']; ?>'  />
                 <?php else:?>
                     <input type='text' name='<?php echo $fieldname; ?>'/>