diff --git a/templates/account-settings.html b/templates/account-settings.html
index 75e88b9..4f1e170 100644
--- a/templates/account-settings.html
+++ b/templates/account-settings.html
@@ -45,7 +45,7 @@
           <span ng-bind="session.subject"></span>
           <p class="text-muted small" ng-bind="session.issuer"></p>
           <div class="divider"></div>
-          <button type="button" class="btn btn-default" disabled ng-if="vm.session.subject == session.subject">Current Profile</button>
+          <button type="button" class="btn btn-default" disabled ng-if="vm.session.subject == session.subject && vm.session.issuer == session.issuer">Current Profile</button>
         </div>
       </div>
     </div>
@@ -56,7 +56,7 @@
             <a class="btn btn-default btn-sm" ng-click="vm.selectSession(session);">Use Account</a>
           </div>
           <div class="col-md-6">
-            <a class="btn btn-default btn-sm pull-right" ng-if="vm.session.subject == session.subject" ng-click="vm.signOut()">Sign Out</a>
+            <a class="btn btn-default btn-sm pull-right" ng-if="vm.session.subject == session.subject && vm.session.issuer == session.issuer" ng-click="vm.signOut()">Sign Out</a>
           </div>
         </div>
       </div>