diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 19c2d94ce1..e7425e65ca 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -72,7 +72,7 @@
       </td>
       <td><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
       <td><?php echo $lang->todo->typeList[$todo->type];?></td>
-      <td><span title="<?php echo zget($lang->todo->priList, $todo->pri,$todo->pri);?>" class='<?php echo 'pri' . zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri, $todo->pri)?></span></td>
+      <td><span title="<?php echo zget($lang->todo->priList, $todo->pri);?>" class='<?php echo 'pri' . zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri, $todo->pri)?></span></td>
       <td class='text-left' title="<?php echo $todo->name;?>"><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my", '', true), $todo->name, '', "data-toggle='modal' data-type='iframe' data-title='" . $lang->todo->view . "' data-icon='check'");?></td>
       <td><?php echo $todo->begin;?></td>
       <td><?php echo $todo->end;?></td>
diff --git a/module/productplan/model.php b/module/productplan/model.php
index 375eead92a..333edc866b 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -136,10 +136,7 @@ class productplanModel extends model
 
         foreach($plans as $key => $value)
         {
-          if(strpos($value,'2030-01-01'))
-          {
-            $plans[$key] = str_replace('2030-01-01 ~ 2030-01-01',$this->lang->productplan->future,$value);
-          }
+            $plans[$key] = str_replace('[2030-01-01 ~ 2030-01-01]', '[' . $this->lang->productplan->future . ']', $value);
         }
         return array('' => '') + $plans;
     }
diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php
index ce8d1fccdd..efae866115 100644
--- a/module/user/view/profile.html.php
+++ b/module/user/view/profile.html.php
@@ -60,10 +60,9 @@
       <th><?php echo $lang->user->role;?></th>
       <td><?php echo $lang->user->roleList[$user->role];?></td>
     </tr>
-    <?php $style = $user->join == '0000-00-00' ? "style='display:none'" : '';?> 
-    <tr <?php echo $style;?>>
+    <tr>
       <th><?php echo $lang->user->join;?></th>
-      <td><?php echo $user->join;?></td>
+      <td><?php echo formatTime($user->join);?></td>
     </tr> 
     <tr>
       <th><?php echo $lang->user->commiter;?></th>