diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 3700df454..5dd552043 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -5,6 +5,7 @@
  - fixed some major oversights in the new profile system.
  - Added macro to return the MIME type to a file, FetchMimeType.
  - fix [ 1378493 ] 6.7.8 collab post edits (images)
+ - fix [ 1363797 ] Calendar Javascript (Date/Time)
  - Fixed bug where viewProfile did not show pretty printed values
  - fix [ 1344146 ] deleting recurring events doesn't work
  - fix [ 1378333 ] [WG 6.7.8] Mail Form template doesn't mark required fields
diff --git a/lib/WebGUI/Asset/Wobject/Article.pm b/lib/WebGUI/Asset/Wobject/Article.pm
index 3b72b3089..144717fa5 100644
--- a/lib/WebGUI/Asset/Wobject/Article.pm
+++ b/lib/WebGUI/Asset/Wobject/Article.pm
@@ -74,43 +74,6 @@ sub definition {
         return $class->SUPER::definition($definition);
 }
 
-
-
-#-------------------------------------------------------------------
-sub getIndexerParams {
-        my $self = shift;
-        my $now = shift;
-        return {
-                Article => {
-                        sql => "select Article.assetId,
-					Article.linkTitle,
-					Article.linkURL,
-					assetData.title,
-					assetData.menuTitle,
-					assetData.url,
-					asset.className,
-					assetData.ownerUserId,
-					assetData.groupIdView,
-					assetData.synopsis,
-					wobject.description
-				from asset, Article
-				left join wobject on wobject.assetId = asset.assetId
-				left join assetData asset.assetId=assetData.assetId
-				where asset.assetId = Article.assetId
-                                        and assetData.startDate < $now
-                                        and assetData.endDate > $now",
-                        fieldsToIndex => ["linkTitle" ,"linkURL","title","menuTitle","url","synopsis","description" ],
-                        contentType => 'content',
-                        url => 'WebGUI::URL::gateway($data{url})',
-                        headerShortcut => 'select title from asset where assetId = \'$data{assetId}\'',
-                        bodyShortcut => 'select description from wobject where assetId = \'$data{assetId}\'',
-                }
-
-        };
-}
-
-
-
 #-------------------------------------------------------------------
 sub view {
 	my $self = shift;
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 5b51caea2..9d4ff82ec 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -274,49 +274,6 @@ sub getEditForm {
 }
 
 
-#-------------------------------------------------------------------
-sub getIndexerParams {
-	my $self = shift;        
-	my $now = shift;
-	return {
-		DataForm_field => {
-                        sql => "select DataForm_field.label as label,
-                                        DataForm_field.subtext as subtext,
-                                        DataForm_field.possibleValues as possibleValues,
-                                        DataForm_field.assetId as assetId,
-                                        DataForm_field.DataForm_fieldId as fid,
-                                        asset.ownerUserId as ownerId,
-                                        asset.url as url,
-                                        asset.groupIdView as groupIdView
-                                        from DataForm_field, asset
-                                        where DataForm_field.assetId = asset.assetId
-					and asset.startDate < $now
-					and asset.endDate > $now",
-                        fieldsToIndex => ["label", "subtext", "possibleValues"],
-                        contentType => 'content',
-                        url => 'WebGUI::URL::gateway($data{url})',
-                        headerShortcut => 'select label from DataForm_field where DataForm_fieldId = \'$data{fid}\'',
-                        bodyShortcut => 'select subtext, possibleValues from DataForm_field where DataForm_fieldId = \'$data{fid}\'',
-                },
-        DataForm_entryData => {
-                        sql => "select distinct(DataForm_entryData.assetId) as assetId,
-                                        asset.ownerUserId as ownerId,
-                                        asset.url as url,
-                                        asset.groupIdView as groupIdView,
-                                        asset.groupIdEdit as special_groupIdView
-                                        from DataForm_entryData, asset
-                                        where DataForm_entryData.assetId = asset.assetId
-					and asset.startDate < $now
-					and asset.endDate > $now",
-                        fieldsToIndex => ['select distinct(value) from DataForm_entryData where assetId = \'$data{assetId}\''],
-                        contentType => 'assetDetail',
-                        url => 'WebGUI::URL::append($data{url}, "func=viewList}")',
-                        headerShortcut => 'select title from asset where assetId = \'$data{assetId}\'',
-                }
-	};
-}
-
-
 #-------------------------------------------------------------------
 sub getListTemplateVars {
 	my $self = shift;
diff --git a/lib/WebGUI/Form/Date.pm b/lib/WebGUI/Form/Date.pm
index a82ded1db..b9dc48d9e 100644
--- a/lib/WebGUI/Form/Date.pm
+++ b/lib/WebGUI/Form/Date.pm
@@ -149,7 +149,6 @@ sub toHtml {
         WebGUI::Style::setScript($session{config}{extrasURL}.'/calendar/lang/calendar-'.$language.'.js',{ type=>'text/javascript' });
         WebGUI::Style::setScript($session{config}{extrasURL}.'/calendar/calendar-setup.js',{ type=>'text/javascript' });
         WebGUI::Style::setLink($session{config}{extrasURL}.'/calendar/calendar-win2k-1.css', { rel=>"stylesheet", type=>"text/css", media=>"all" });
-	my $mondayFirst = $session{user}{firstDayOfWeek} ? "true" : "false";
         return $self->SUPER::toHtml. '<script type="text/javascript"> 
                         Calendar.setup({ 
                                 inputField : "'.$self->{id}.'", 
@@ -157,7 +156,7 @@ sub toHtml {
                                 showsTime : false, 
                                 step : 1,
                                 timeFormat : "12",
-                                mondayFirst : '.$mondayFirst.'
+                                firstDay : '.$session{user}{firstDayOfWeek}.'
                                 }); 
                         </script>';
 }
diff --git a/lib/WebGUI/Form/DateTime.pm b/lib/WebGUI/Form/DateTime.pm
index d0abbe7d8..9f5cbce12 100644
--- a/lib/WebGUI/Form/DateTime.pm
+++ b/lib/WebGUI/Form/DateTime.pm
@@ -138,7 +138,7 @@ sub toHtml {
                                 showsTime : true, 
                                 step : 1,
                                 timeFormat : "12",
-                                mondayFirst : '.$mondayFirst.'
+                                firstDay : '.$session{user}{firstDayOfWeek}.'
                                 }); 
                         </script>';
 }