diff --git a/site/views/leases/move_out.ctp b/site/views/leases/move_out.ctp
index bf976ac..666aacc 100644
--- a/site/views/leases/move_out.ctp
+++ b/site/views/leases/move_out.ctp
@@ -45,6 +45,7 @@ echo '<P><BR>' . "\n";
 
 // Reset the form
 function resetForm() {
+  datepickerNow('LeaseMoveoutDate', false);
 }
 --></script>
 
@@ -79,8 +80,9 @@ echo $this->element('form_table',
 		    array('class'  => "item move-out entry",
 			  'field_prefix' => 'Lease',
 			  'fields' => array
-			  ("moveout_date" => array('opts' => array('type' => 'text',
-								   'id' => 'datepicker')),
+			  ("moveout_date" => array('opts' => array('type' => 'text'),
+						  'between' => '<A HREF="#" ONCLICK="datepickerNow(\'LeaseMoveoutDate\', false); return false;">Now</A>',
+						  ),
 			   )));
 
 // Set up a redirect page.  I use lower case 'redirect' here
@@ -97,11 +99,12 @@ echo $form->end('Perform Move Out');
 
 <script type="text/javascript"><!--
   $(document).ready(function(){
-      $("#datepicker").datepicker({ constrainInput: true,
-	                            numberOfMonths: [1, 1],
-                                    showCurrentAtPos: 0,
-                                    dateFormat: 'mm/dd/yy' })
-	.datepicker('setDate', '+0');
+      $("#LeaseMoveoutDate")
+	.attr('autocomplete', 'off')
+	.datepicker({ constrainInput: true,
+	              numberOfMonths: [1, 1],
+	              showCurrentAtPos: 0,
+                      dateFormat: 'mm/dd/yy' });
 
       resetForm();
   });