diff --git a/module/my/control.php b/module/my/control.php
index 536605414e..7b276eebe0 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -375,10 +375,14 @@ class my extends control
         $this->app->loadConfig('user');
         $this->app->loadLang('user');
 
+        $userGroups = $this->loadModel('group')->getByAccount($this->app->user->account);
+
         $this->view->title      = $this->lang->my->common . $this->lang->colon . $this->lang->my->editProfile;
         $this->view->position[] = $this->lang->my->editProfile;
         $this->view->user       = $this->user->getById($this->app->user->account);
         $this->view->rand       = $this->user->updateSessionRandom();
+        $this->view->userGroups = implode(',', array_keys($userGroups));
+        $this->view->groups     = $this->dao->select('id, name')->from(TABLE_GROUP)->fetchPairs('id', 'name');
 
         $this->display();
     }
diff --git a/module/my/view/editprofile.html.php b/module/my/view/editprofile.html.php
index 3b34754ead..1a5eba4e30 100644
--- a/module/my/view/editprofile.html.php
+++ b/module/my/view/editprofile.html.php
@@ -36,7 +36,7 @@
         <th><?php echo $lang->user->join;?></th>
         <td class='text-middle'>
           <?php echo formatTime($user->join);?>
-          <?php echo html::hidden('join',$user->join);?>
+          <?php echo html::hidden('join',$user->join) .  html::select('groups[]', $groups, $userGroups, 'multiple=multiple class="form-control hidden"');?>
         </td>
       </tr>
     </table>