diff --git a/module/my/view/team.html.php b/module/my/view/team.html.php
index df72944d97..b253907ba1 100644
--- a/module/my/view/team.html.php
+++ b/module/my/view/team.html.php
@@ -13,11 +13,11 @@
 <?php
 include '../../common/view/header.html.php';
 ?>
+<div id="mainMenu" class="clearfix">
+  <div class="btn-toolbar pull-right"><?php common::printLink('user', 'create', "dept={$deptID}", "<i class='icon icon-plus'></i> " . $lang->user->create, '', "class='btn btn-primary create-user-btn' data-app='admin'");?></div>
+</div>
 <div id='mainContent' class='main-row fade'>
-  <div id="mainMenu" class="clearfix">
-    <div class="btn-toolbar pull-right"><?php common::printLink('user', 'create', "dept={$deptID}", "<i class='icon icon-plus'></i> " . $lang->user->create, '', "class='btn btn-primary create-user-btn' data-app='admin'");?></div>
-  </div>
-  <div id="mainContent" class='main-col'>
+  <div class='main-col'>
     <div class="cell" id="queryBox" data-module='user'></div>
     <form class='main-table table-user' data-ride='table' method='post' data-checkable='false' id='userListForm'>
       <table class='table has-sort-head' id='userList'>
diff --git a/module/user/control.php b/module/user/control.php
index fbdfe74293..2c7a00be88 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -538,15 +538,14 @@ class user extends control
 
         $title      = $this->lang->company->common . $this->lang->colon . $this->lang->user->create;
         $position[] = $this->lang->user->create;
-        $this->view->title      = $title;
-        $this->view->gobackLink = $this->createLink('company', 'browse');
-        $this->view->position   = $position;
-        $this->view->depts      = $this->dept->getOptionMenu();
-        $this->view->groupList  = $groupList;
-        $this->view->roleGroup  = $roleGroup;
-        $this->view->deptID     = $deptID;
-        $this->view->rand       = $this->user->updateSessionRandom();
-        $this->view->companies  = $this->loadModel('company')->getOutsideCompanies();
+        $this->view->title     = $title;
+        $this->view->position  = $position;
+        $this->view->depts     = $this->dept->getOptionMenu();
+        $this->view->groupList = $groupList;
+        $this->view->roleGroup = $roleGroup;
+        $this->view->deptID    = $deptID;
+        $this->view->rand      = $this->user->updateSessionRandom();
+        $this->view->companies = $this->loadModel('company')->getOutsideCompanies();
 
         $this->display();
     }
diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php
index 9f0ef23954..71cab7c1a0 100644
--- a/module/user/view/create.html.php
+++ b/module/user/view/create.html.php
@@ -111,7 +111,7 @@ $showVisionList = count($visionList) > 1;
           <td class='text-center form-actions'>
             <?php if(!$showVisionList) echo html::hidden("visions[]", $this->config->vision);?>
             <?php echo html::submitButton();?>
-            <?php echo html::a($gobackLink, $lang->goback, '', 'class="btn btn-wide"')?>
+            <?php echo html::a($this->createLink('company', 'browse'), $lang->goback, '', 'class="btn btn-wide"')?>
           </td>
         </tr>
       </table>