diff --git a/contrib/openldap/core-fd.schema b/contrib/openldap/core-fd.schema
index 45f16705ee579722baf98db9ad2a9c2cc61e6315..5fbdc63bf3ca70c808784cc568e657028e0b1335 100644
--- a/contrib/openldap/core-fd.schema
+++ b/contrib/openldap/core-fd.schema
@@ -293,12 +293,10 @@ attributetype ( 1.3.6.1.4.1.38414.89.1.1 NAME 'fdTasksMailObject'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE )
 
-attributetype ( 1.3.6.1.4.1.38414.89.1.2 NAME 'fdTasksSchedule'
+attributetype ( 1.3.6.1.4.1.38414.89.1.2 NAME 'fdTasksScheduleDate'
 	DESC 'Scheduling of the Task - required processed date'
-	EQUALITY generalizedTimeMatch
-	ORDERING generalizedTimeOrderingMatch
-	SINGLE-VALUE
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
 attributetype ( 1.3.6.1.4.1.38414.89.1.3 NAME 'fdTasksMailUsers'
   DESC 'Fusion Directory - Tasks Mail Users Recipient'
@@ -417,7 +415,7 @@ objectclass ( 1.3.6.1.4.1.38414.88.2.5 NAME 'fdMailTemplateInvitations'
 objectclass (1.3.6.1.4.1.38414.89.2.1 NAME 'fdTasks'
   DESC 'FusionDirectory - Tasks objects'
   MUST ( cn $ fdTasksStatus $ fdTasksCreationDate )
-  MAY ( fdTasksSchedule $ fdTasksEndDate) )
+  MAY ( fdTasksScheduleDate $ fdTasksEndDate) )
 
 objectclass (1.3.6.1.4.1.38414.89.2.2 NAME 'fdTasksMail'
   DESC 'FusionDirectory - Tasks objects Mail'
diff --git a/plugins/addons/tasks/class_tasks.inc b/plugins/addons/tasks/class_tasks.inc
index 73ec09b32525b821bb8166500315cd0323f7ba55..4c3d4849e0af0509388db7ecc4a875843fc75964 100644
--- a/plugins/addons/tasks/class_tasks.inc
+++ b/plugins/addons/tasks/class_tasks.inc
@@ -51,11 +51,10 @@ class tasks extends simplePlugin
           _('Task Name'), _('Name for this task'),
           'cn', TRUE
         ),
-        new GeneralizedTimeDateAttribute(
-          _('Task Schedule'), _('Date when this task is required to be processed'),
-          'fdTasksSchedule', FALSE,
-          ''
-        ),
+         new DateTimeAttribute(
+           _('Schedule'), '',
+           'fdTasksScheduleDate', FALSE
+           ),
         new HiddenAttribute('fdTasksStatus', TRUE, '1', '', 'Status', 'Status of the task'),
         new HiddenAttribute('fdTasksCreationDate', TRUE, date("Y-m-d h:i:sa"), '', 'StartDate', 'Start Date And Time Of A Task'),
         ]