diff --git a/lib/front/front.class.php b/lib/front/front.class.php
index e4da51367d..d9078b82f8 100644
--- a/lib/front/front.class.php
+++ b/lib/front/front.class.php
@@ -259,7 +259,7 @@ class html extends baseHTML
         }
         elseif(is_object($user))
         {
-            $userObj->avatar  = $user->avatar;
+            $userObj->avatar  = isset($user->avatar) ? $user->avatar : '';
             $userObj->account = $user->account;
             $userObj->name    = isset($user->name) ? $user->name : (isset($user->realname) ? $user->realname : $user->account);
             $user = $userObj;
diff --git a/module/user/model.php b/module/user/model.php
index 1be9b079b9..4cd28e993e 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -228,7 +228,7 @@ class userModel extends model
     {
         $users = $this->dao->select('account, realname, avatar, dept, role')->from(TABLE_USER)
             ->where('deleted')->eq(0)
-            ->beginIF($accounts)->andWhere('type')->eq($type)->fi()
+            ->beginIF($type)->andWhere('type')->eq($type)->fi()
             ->beginIF($accounts)->andWhere('account')->in($accounts)->fi()
             ->fetchAll('account');