diff --git a/module/my/css/profile.css b/module/my/css/profile.css
index 1671f2e971..3b7ff34334 100644
--- a/module/my/css/profile.css
+++ b/module/my/css/profile.css
@@ -6,8 +6,7 @@ table+table{border-top: 1px solid #eee;}
 .row td{width: 33%; text-align: left; font-weight: 700;}
 .main-actions{margin: 20px 0 20px 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;}
+.avatar{display: inline-block; width: 50px; height: 50px; line-height: 50px;}
+.avatar .btn{padding: 0;vertical-align: revert; border: 0;}
 .user-name{margin-left: 15px}
 .user-name, .user-role{font-size: 16px; vertical-align: top;}
-#avatarUploadBtn{padding: 4px 12px; position: relative; left: 32px; bottom: 30px;}
-#avatarForm{height: 10px}
diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php
index 2c12cbf71e..2fb4952dc1 100644
--- a/module/my/view/profile.html.php
+++ b/module/my/view/profile.html.php
@@ -15,25 +15,14 @@
   <div class='cell'>
     <div class='main-header text-center'>
       <span class="avatar avatar bg-secondary avatar-circle">
-      <?php 
-      if($user->avatar)
-      {
-          echo html::image($user->avatar);
-      }
-      else
-      {
-          echo strtoupper($user->account[0]);
-      }
-      ?>
+        <form method='post' class='form-ajax' action=<?php echo inlink('uploadAvatar');?> id='avatarForm' enctype='multipart/form-data'>
+          <input type="file" name="files" id="files" class="form-control hidden">
+          <?php $avatar = $user->avatar ? html::image($user->avatar) : strtoupper($user->account[0]);?>
+          <?php echo html::a('javascript:void(0);', $avatar, '', "class='btn btn-avatar' id='avatarUploadBtn' data-placement='right'");?>
+        </form>
       </span>
-      <?php if(!isset($fromModule)):?>
       <span class='user-name'><strong><?php echo $user->realname;?></strong></span>
       <span class='user-role'><?php echo zget($lang->user->roleList, $user->role);?></span>
-      <form method='post' class='form-ajax' action=<?php echo inlink('uploadAvatar');?> id='avatarForm' enctype='multipart/form-data'>
-        <input type="file" name="files" id="files" class="form-control hidden">
-        <?php echo html::a('javascript:void(0);', $lang->my->uploadAvatar, '', "class='btn btn-avatar' id='avatarUploadBtn' data-placement='right'");?>
-      </form>
-      <?php endif;?>
     </div>
     <div class='row'>
       <table>