diff --git a/system/autoload/Lang.php b/system/autoload/Lang.php
index 5d9b707a..de8dca4c 100644
--- a/system/autoload/Lang.php
+++ b/system/autoload/Lang.php
@@ -39,7 +39,11 @@ class Lang
 
     public static function dateTimeFormat($date){
         global $config;
-        return date($config['date_format']. ' H:i', strtotime($date));
+        if(strtotime($date) < strtotime("2000-01-01 00:00:00")){
+            return "";
+        }else{
+            return date($config['date_format']. ' H:i', strtotime($date));
+        }
     }
 
     public static function dateAndTimeFormat($date, $time){
diff --git a/ui/ui/user-dashboard.tpl b/ui/ui/user-dashboard.tpl
index 4a7f413d..b78db300 100644
--- a/ui/ui/user-dashboard.tpl
+++ b/ui/ui/user-dashboard.tpl
@@ -12,8 +12,7 @@
                     <tbody>
                         <tr>
                             <td>{Lang::T('expired')}</td>
-                            <td>{date({$_c['date_format']}, strtotime($unpaid['expired_date']))}
-                                {date('H:i', strtotime($unpaid['expired_date']))} </td>
+                            <td>{Lang::dateTimeFormat($unpaid['expired_date'])} </td>
                         </tr>
                         <tr>
                             <td>{$_L['Plan_Name']}</td>
@@ -30,10 +29,22 @@
                     </tbody>
                 </table>
                 <div class="box-footer p-2">
-                    <a class="btn btn-danger btn-block btn-sm" href="{$_url}order/view/{$unpaid['id']}">
-                        <span class="icon"><i class="ion ion-card"></i></span>
-                        <span>{Lang::T('PAY NOW')}</span>
-                    </a>
+                    <div class="btn-group btn-group-justified mb15">
+                        <div class="btn-group">
+                            <a href="{$_url}order/view/{$unpaid['id']}/cancel" class="btn btn-danger btn-sm"
+                                onclick="return confirm('{Lang::T('Cancel it?')}')">
+                                <span class="glyphicon glyphicon-trash"></span>
+                                {Lang::T('Cancel')}
+                            </a>
+                        </div>
+                        <div class="btn-group">
+                            <a class="btn btn-success btn-block btn-sm" href="{$_url}order/view/{$unpaid['id']}">
+                                <span class="icon"><i class="ion ion-card"></i></span>
+                                <span>{Lang::T('PAY NOW')}</span>
+                            </a>
+                        </div>
+                    </div>
+
                 </div>
             </div>
         {/if}
diff --git a/ui/ui/user-login.tpl b/ui/ui/user-login.tpl
index 3a5a4d29..5d5ea4de 100644
--- a/ui/ui/user-login.tpl
+++ b/ui/ui/user-login.tpl
@@ -70,10 +70,10 @@
                             </div>
                             <div class="btn-group btn-group-justified mb15">
                                 <div class="btn-group">
-                                    <button type="submit" class="btn btn-primary">{$_L['Login']}</button>
+                                    <a href="{$_url}register" class="btn btn-success">{$_L['Register']}</a>
                                 </div>
                                 <div class="btn-group">
-                                    <a href="{$_url}register" class="btn btn-success">{$_L['Register']}</a>
+                                    <button type="submit" class="btn btn-primary">{$_L['Login']}</button>
                                 </div>
                             </div>
                         </form>