diff --git a/module/testcase/config.php b/module/testcase/config.php
index b2bd05fc9c..89b3fef2f1 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -40,7 +40,7 @@ $config->testcase->edit->requiredFields   = 'title,type';
 
 $config->testcase->exportFields = '
     id, product, module, story,
-    title, precondition, steps, keywords,
+    title, precondition, stepDesc, stepExpect, keywords,
     pri, type, stage, status, frequency,
     openedBy, openedDate, lastEditedBy, lastEditedDate, 
     version,linkCase';
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 51ac03c4c0..6131616395 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -534,25 +534,30 @@ class testcase extends control
             $relatedStories = $this->dao->select('id,title')->from(TABLE_STORY) ->where('id')->in($relatedStoryIdList)->fetchPairs();
             $relatedCases   = $this->dao->select('id, title')->from(TABLE_CASE)->where('id')->in($relatedCaseIdList)->fetchPairs();
             $relatedSteps   = $this->dao->select('`case`, version, `desc`, expect')->from(TABLE_CASESTEP)->where('`case`')->in(@array_keys($cases))->orderBy('version desc,id')->fetchGroup('case');
+            $relatedModules = array('0' => '/') + $relatedModules;
 
             foreach($cases as $case)
             {
-                $case->steps = '';
+                $case->stepDesc   = '';
+                $case->stepExpect = '';
                 if(isset($relatedSteps[$case->id]))
                 {
                     $i = 1;
                     foreach($relatedSteps[$case->id] as $step)
                     {
                         if($step->version != $case->version) continue;
-                        $case->steps .= $i . ":" . $step->desc . '<br />' . $caseLang->stepExpect . ':' . $step->expect . '<br />';
+                        $case->stepDesc   .= $i . "." . $step->desc . "\n";
+                        $case->stepExpect .= $i . "." . $step->expect . "\n";
                         $i ++;
                     }
                 }
 
                 if($this->post->fileType == 'csv')
                 {
-                    $case->steps = str_replace('<br />', "\n", $case->steps);
-                    $case->steps = str_replace('"', '""', $case->steps);
+                    $case->stepDesc   = str_replace('<br />', "\n", $case->stepDesc);
+                    $case->stepDesc   = str_replace('"', '""', $case->stepDesc);
+                    $case->stepExpect = str_replace('<br />', "\n", $case->stepExpect);
+                    $case->stepExpect = str_replace('"', '""', $case->stepExpect);
                 }
 
                 /* fill some field with useful value. */
diff --git a/module/user/control.php b/module/user/control.php
index 33f37659a8..3a0136cff8 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -472,7 +472,7 @@ class user extends control
      */
     public function logout($referer = 0)
     {
-        $this->loadModel('action')->create('user', $this->app->user->id, 'logout');
+        if(isset($this->app->user->id)) $this->loadModel('action')->create('user', $this->app->user->id, 'logout');
         session_destroy();
         setcookie('za', false);
         setcookie('zp', false);