diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index e4c7a0eaa..350c1d585 100755
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -1515,13 +1515,13 @@ class processMap
                 $aFields['TAS_CALENDAR'] = $calendarInfo['CALENDAR_APPLIED'] != 'DEFAULT' ? $calendarInfo['CALENDAR_UID'] : "";
             }
 
-            if ($iForm == 2) {
-                switch ($aFields["TAS_ASSIGN_TYPE"]) {
-                    case "SELF_SERVICE":
-                        $aFields["TAS_ASSIGN_TYPE"] = (!empty($aFields["TAS_GROUP_VARIABLE"])) ? "SELF_SERVICE_EVALUATE" : $aFields["TAS_ASSIGN_TYPE"];
-                        break;
-                }
-            }
+            //if ($iForm == 2) {
+            //    switch ($aFields["TAS_ASSIGN_TYPE"]) {
+            //        case "SELF_SERVICE":
+            //            $aFields["TAS_ASSIGN_TYPE"] = (!empty($aFields["TAS_GROUP_VARIABLE"])) ? "SELF_SERVICE_EVALUATE" : $aFields["TAS_ASSIGN_TYPE"];
+            //            break;
+            //    }
+            //}
 
             global $G_PUBLISH;
             G::LoadClass('xmlfield_InputPM');
diff --git a/workflow/engine/classes/model/AppCacheView.php b/workflow/engine/classes/model/AppCacheView.php
index 15fb6d275..e6ce5f602 100755
--- a/workflow/engine/classes/model/AppCacheView.php
+++ b/workflow/engine/classes/model/AppCacheView.php
@@ -343,7 +343,7 @@ class AppCacheView extends BaseAppCacheView
         $c->addJoin(TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $c->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN);
         $c->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
-        $c->add(TaskPeer::TAS_ASSIGN_TYPE, 'SELF_SERVICE');
+        $c->add(TaskPeer::TAS_ASSIGN_TYPE, 'SELF_SERVICE_EVALUATE');
         $c->add(TaskPeer::TAS_GROUP_VARIABLE, '', Criteria::NOT_EQUAL);
         $rs = TaskPeer::doSelectRS($c);
         $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index eef2d131d..c421af9b7 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -1243,7 +1243,7 @@
       <rule name="validValues" value="TRUE|FALSE" message="Please select a valid value for TAS_ALERT."/>
     </validator>
     <validator column="TAS_ASSIGN_TYPE">
-      <rule name="validValues" value="BALANCED|MANUAL|EVALUATE|REPORT_TO|SELF_SERVICE|STATIC_MI|CANCEL_MI" message="Please select a valid value for TAS_ASSIGN_TYPE."/>
+      <rule name="validValues" value="BALANCED|MANUAL|EVALUATE|REPORT_TO|SELF_SERVICE|SELF_SERVICE_EVALUATE|STATIC_MI|CANCEL_MI" message="Please select a valid value for TAS_ASSIGN_TYPE."/>
     </validator>
     <validator column="TAS_ASSIGN_LOCATION">
       <rule name="validValues" value="TRUE|FALSE" message="Please select a valid value for TAS_ASSIGN_LOCATION."/>
diff --git a/workflow/engine/methods/tasks/tasks_Ajax.php b/workflow/engine/methods/tasks/tasks_Ajax.php
index fd90b99e4..034e63cf8 100755
--- a/workflow/engine/methods/tasks/tasks_Ajax.php
+++ b/workflow/engine/methods/tasks/tasks_Ajax.php
@@ -64,12 +64,12 @@ try {
             }
 
             //Validating TAS_ASSIGN_VARIABLE value
-            if (!isset($aData['TAS_ASSIGN_TYPE'])) {
-                $aData['TAS_ASSIGN_TYPE'] = 'BALANCED';
-            }
-            if ($aData['TAS_ASSIGN_TYPE'] == 'SELF_SERVICE_EVALUATE') {
-                $aData['TAS_ASSIGN_TYPE'] = 'SELF_SERVICE';
-            } else {
+            //if (!isset($aData['TAS_ASSIGN_TYPE'])) {
+            //    $aData['TAS_ASSIGN_TYPE'] = 'BALANCED';
+            //}
+            if ($aData['TAS_ASSIGN_TYPE'] != 'SELF_SERVICE_EVALUATE') {
+            //    $aData['TAS_ASSIGN_TYPE'] = 'SELF_SERVICE';
+            //} else {
                 $aData['TAS_GROUP_VARIABLE'] = '';
             }