diff --git a/site/views/leases/move_in.ctp b/site/views/leases/move_in.ctp
index 8aa4f93..5e1a317 100644
--- a/site/views/leases/move_in.ctp
+++ b/site/views/leases/move_in.ctp
@@ -52,6 +52,7 @@ function resetForm() {
   $("#movein-customer").html("INTERNAL ERROR");
   $("#unit-id").val(0);
   $("#movein-unit").html("INTERNAL ERROR");
+  datepickerNow('LeaseMoveinDate', false);
 }
 
 function onRowSelect(grid_id, item_type, item_id) {
@@ -159,8 +160,9 @@ echo $this->element('form_table',
 		    array('class'  => "item move-in entry",
 			  'field_prefix' => 'Lease',
 			  'fields' => array
-			  ("movein_date" => array('opts' => array('type' => 'text',
-								  'id' => 'datepicker')),
+			  ("movein_date" => array('opts' => array('type' => 'text'),
+						  'between' => '<A HREF="#" ONCLICK="datepickerNow(\'LeaseMoveinDate\', false); return false;">Now</A>',
+						  ),
 			   "comment" => array('opts' => array('size' => 50)),
 			   )));
 		  
@@ -170,11 +172,12 @@ echo $form->end('Move In Customer');
 
 <script type="text/javascript"><!--
   $(document).ready(function(){
-      $("#datepicker").datepicker({ constrainInput: true,
-	                            numberOfMonths: [1, 1],
-                                    showCurrentAtPos: 0,
-                                    dateFormat: 'mm/dd/yy' })
-	.datepicker('setDate', '+0');
+      $("#LeaseMoveinDate")
+	.attr('autocomplete', 'off')
+	.datepicker({ constrainInput: true,
+	              numberOfMonths: [1, 1],
+	              showCurrentAtPos: 0,
+                      dateFormat: 'mm/dd/yy' });
 
       resetForm();
 
diff --git a/site/webroot/js/pmgr.js b/site/webroot/js/pmgr.js
index 0ead35a..b9b96be 100644
--- a/site/webroot/js/pmgr.js
+++ b/site/webroot/js/pmgr.js
@@ -145,17 +145,21 @@ function fmtCurrency(amount) {
 //
 // Datepicker helpers
 
-function datepickerNow(id) {
+function datepickerNow(id, usetime) {
   now = new Date();
   // datepicker seems to squash the time portion,
   // so we have to pass in a copy of now instead.
   $("#"+id).datepicker('setDate', new Date(now));
-  $("#"+id).val($("#"+id).val()
-		+ ' '
-		+ (now.getHours() < 10 ? '0' : '')
-		+ now.getHours() + ':'
-		+ (now.getMinutes() < 10 ? '0' : '')
-		+ now.getMinutes());
+  if (usetime == null)
+      usetime = true;
+  $("#"+id).val($("#"+id).val() +
+		(usetime
+		 ? (' '
+		    + (now.getHours() < 10 ? '0' : '')
+		    + now.getHours() + ':'
+		    + (now.getMinutes() < 10 ? '0' : '')
+		    + now.getMinutes())
+		 : ''));
 }
 
 function datepickerSet(fromid, id, a, b) {