diff --git a/module/my/css/profile.css b/module/my/css/profile.css
index 2503e3d1e5..e956e09e71 100644
--- a/module/my/css/profile.css
+++ b/module/my/css/profile.css
@@ -1,10 +1,9 @@
 .body-modal .main-header {padding: 13px 0px 0px 0;}
-.row {height: 340px;}
 .row table {width: 100%; margin-top: 5px;}
 table+table {border-top: 1px solid #eee;}
 .row th {width: 17%; line-height: 30px; padding-right: 20px; text-align: right; font-weight: 500;}
 .row td {width: 33%; text-align: left; font-weight: 700;}
-.main-actions {margin: 20px 0 20px 0; text-align: center;}
+.main-actions {margin: 5px 0 10px 0; text-align: center;}
 .user-title {margin: 10px 10px -10px 10px; font-size: 14px; font-weight: bold; padding-left: 10px;}
 .avatar {display: inline-block; width: 50px; height: 50px; line-height: 50px;}
 #avatarForm {width: 100%; height: 100%;}
diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php
index ee50dcc11e..4807c5c7de 100644
--- a/module/my/view/profile.html.php
+++ b/module/my/view/profile.html.php
@@ -22,7 +22,7 @@
         </form>
       </span>
       <span class='user-name'><?php echo $user->realname;?></span>
-      <span class='user-role'><?php echo zget($lang->user->roleList, $user->role);?></span>
+      <span class='user-role'><?php echo zget($lang->user->roleList, $user->role, '');?></span>
     </div>
     <div class='row'>
       <table>
@@ -36,7 +36,7 @@
           <th><?php echo $lang->user->account;?></th>
           <td><?php echo $user->account;?></td>
           <th><?php echo $lang->user->email;?></th>
-          <td title='<?php echo $user->email;?>'><?php echo $user->email;?></td>
+          <td title='<?php echo $user->email;?>'><?php echo html::mailto($user->email);?></td>
         </tr>
         <tr>
           <th><?php echo $lang->user->dept;?></th>
@@ -57,7 +57,7 @@
           ?>
           </td>
           <th><?php echo $lang->user->role;?></th>
-          <td><?php echo zget($lang->user->roleList, $user->role);?></td>
+          <td><?php echo zget($lang->user->roleList, $user->role, '');?></td>
         </tr>
         <tr>
           <th><?php echo $lang->user->join;?></th>
diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php
index 06a7f74e60..5bae632811 100644
--- a/module/user/view/profile.html.php
+++ b/module/user/view/profile.html.php
@@ -23,7 +23,7 @@
       <?php echo $user->avatar ? html::image($user->avatar) : strtoupper($user->account[0]);?>
       </span>
       <span class='user-name'><?php echo $user->realname;?></span>
-      <span class='user-role'><?php echo zget($lang->user->roleList, $user->role);?></span>
+      <span class='user-role'><?php echo zget($lang->user->roleList, $user->role, '');?></span>
     </div>
     <div class='row'>
       <table>
@@ -37,7 +37,7 @@
           <th><?php echo $lang->user->account;?></th>
           <td><?php echo $user->account;?></td>
           <th><?php echo $lang->user->email;?></th>
-          <td title='<?php echo $user->email;?>'><?php echo $user->email;?></td>
+          <td title='<?php echo $user->email;?>'><?php echo html::mailto($user->email);?></td>
         </tr>
         <tr>
           <th><?php echo $lang->user->dept;?></th>
@@ -58,7 +58,7 @@
           ?>
           </td>
           <th><?php echo $lang->user->role;?></th>
-          <td><?php echo zget($lang->user->roleList, $user->role);?></td>
+          <td><?php echo zget($lang->user->roleList, $user->role, '');?></td>
         </tr>
         <tr>
           <th><?php echo $lang->user->join;?></th>