diff --git a/browser/main/Containers/UserContainer.jsx b/browser/main/Containers/UserContainer.jsx
index a8145f02..f9cbab9b 100644
--- a/browser/main/Containers/UserContainer.jsx
+++ b/browser/main/Containers/UserContainer.jsx
@@ -223,7 +223,9 @@ module.exports = React.createClass({
   renderTeamHome: function (currentUser) {
     var user = this.state.user
 
-    var isOwner = true
+    var isOwner = user.Members == null ? false : user.Members.some(function (member) {
+      return member.id === currentUser.id && member.TeamMember.role === 'owner'
+    })
 
     var userPlanets = user.Planets.map(function (planet) {
       return (
@@ -257,7 +259,7 @@ module.exports = React.createClass({
             <div className='userName'>{user.name}</div>
           </div>
 
-          <button onClick={this.openTeamSettingsModal} className='editProfileButton'>Team settings</button>
+          {isOwner ? (<button onClick={this.openTeamSettingsModal} className='editProfileButton'>Team settings</button>) : null}
         </div>
         <div className='memberList'>
           <div className='memberLabel'>{members.length} {members.length > 1 ? 'Members' : 'Member'}</div>
diff --git a/browser/main/Mixins/Helper.js b/browser/main/Mixins/Helper.js
index fa8ec774..ee9d8564 100644
--- a/browser/main/Mixins/Helper.js
+++ b/browser/main/Mixins/Helper.js
@@ -1,4 +1,5 @@
 function deleteItemFromTargetArray (item, targetArray) {
+  if (targetArray == null) targetArray = []
   targetArray.some(function (_item, index) {
     if (_item.id === item.id) {
       targetArray.splice(index, 1)
@@ -11,6 +12,8 @@ function deleteItemFromTargetArray (item, targetArray) {
 }
 
 function updateItemToTargetArray (item, targetArray) {
+  if (targetArray == null) targetArray = []
+
   var isNew = !targetArray.some(function (_item, index) {
     if (_item.id === item.id) {
       targetArray.splice(index, 1, item)
diff --git a/browser/main/Services/Hq.js b/browser/main/Services/Hq.js
index 518d7916..500e5922 100644
--- a/browser/main/Services/Hq.js
+++ b/browser/main/Services/Hq.js
@@ -35,6 +35,9 @@ module.exports = {
   fetchUser: function (userName) {
     return request
       .get(apiUrl + 'resources/' + userName)
+      .set({
+        Authorization: 'Bearer ' + localStorage.getItem('token')
+      })
   },
   updateUser: function (userName, input) {
     return request
@@ -79,6 +82,9 @@ module.exports = {
   fetchPlanet: function (userName, planetName) {
     return request
       .get(apiUrl + 'resources/' + userName + '/planets/' + planetName)
+      .set({
+        Authorization: 'Bearer ' + localStorage.getItem('token')
+      })
   },
   updatePlanet: function (userName, planetName, input) {
     return request