diff --git a/plugins/box/pages/pages.admin.php b/plugins/box/pages/pages.admin.php
index 4a62e0e..77a7165 100755
--- a/plugins/box/pages/pages.admin.php
+++ b/plugins/box/pages/pages.admin.php
@@ -50,9 +50,6 @@ class PagesAdmin extends Backend
         $users = new Table('users');
         $user = $users->select('[id='.Session::get('user_id').']', null);
 
-        $user['firstname'] = Html::toText($user['firstname']);
-        $user['lastname']  = Html::toText($user['lastname']);
-
         // Page author
         if ( ! empty($user['firstname'])) {
             $author = (empty($user['lastname'])) ? $user['firstname'] : $user['firstname'].' '.$user['lastname'];
@@ -60,6 +57,8 @@ class PagesAdmin extends Backend
             $author = Session::get('user_login');
         }
 
+        $author = Html::toText($author);
+
         // Status array
         $status_array = array('published' => __('Published', 'pages'),
                               'draft'     => __('Draft', 'pages'));