diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js
index b87c53b8e..4cbb7cc23 100644
--- a/client/components/boards/boardsList.js
+++ b/client/components/boards/boardsList.js
@@ -156,6 +156,7 @@ BlazeComponent.extendComponent({
 
     if (FlowRouter.getRouteName() === 'home'){
       query.$and[2].$or.push({'members.userId': Meteor.userId()});
+
       if(allowPrivateVisibilityOnly !== undefined && allowPrivateVisibilityOnly.booleanValue){
         query.$and.push({'permission': 'private'});
       }
diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade
index 456a450e3..98e8c36b9 100644
--- a/client/components/users/userHeader.jade
+++ b/client/components/users/userHeader.jade
@@ -49,10 +49,11 @@ template(name="memberMenuPopup")
             i.fa.fa-lock
             | {{_ 'admin-panel'}}
       hr
-      li
-        a.js-edit-profile
-          i.fa.fa-user
-          | {{_ 'edit-profile'}}
+      if isNotOAuth2AuthenticationMethod
+        li
+          a.js-edit-profile
+            i.fa.fa-user
+            | {{_ 'edit-profile'}}
       li
         a.js-change-settings
           i.fa.fa-cog
@@ -62,10 +63,11 @@ template(name="memberMenuPopup")
           i.fa.fa-picture-o
           | {{_ 'edit-avatar'}}
       unless isSandstorm
-        li
-          a.js-change-password
-            i.fa.fa-key
-            | {{_ 'changePasswordPopup-title'}}
+        if isNotOAuth2AuthenticationMethod
+          li
+            a.js-change-password
+              i.fa.fa-key
+              | {{_ 'changePasswordPopup-title'}}
       li
         a.js-change-language
           i.fa.fa-flag
diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js
index 5fe2598db..f3b139d26 100644
--- a/client/components/users/userHeader.js
+++ b/client/components/users/userHeader.js
@@ -22,6 +22,14 @@ Template.memberMenuPopup.helpers({
       return false;
     }
   },
+  isNotOAuth2AuthenticationMethod(){
+    currentUser = Meteor.user();
+    if (currentUser) {
+      return currentUser.authenticationMethod != 'OAuth2';
+    } else {
+      return true;
+    }
+  }
 });
 
 Template.memberMenuPopup.events({
diff --git a/models/users.js b/models/users.js
index 6796f7251..cd1c674c8 100644
--- a/models/users.js
+++ b/models/users.js
@@ -445,6 +445,7 @@ Users.safeFields = {
   'profile.initials': 1,
   orgs: 1,
   teams: 1,
+  authenticationMethod: 1,
 };
 
 if (Meteor.isClient) {
diff --git a/server/publications/users.js b/server/publications/users.js
index fd6147d13..df50f7be8 100644
--- a/server/publications/users.js
+++ b/server/publications/users.js
@@ -25,6 +25,7 @@ Meteor.publish('user-admin', function() {
       isAdmin: 1,
       teams: 1,
       orgs: 1,
+      authenticationMethod: 1,
     },
   });
 });