diff --git a/static/partials/user-admin.html b/static/partials/user-admin.html
index 862a24426..324acfa37 100644
--- a/static/partials/user-admin.html
+++ b/static/partials/user-admin.html
@@ -30,7 +30,8 @@
         <li ng-show="hasPaidPlan"><a href="javascript:void(0)" data-toggle="tab" data-target="#billingoptions">Billing Options</a></li>
         <li ng-show="hasPaidBusinessPlan"><a href="javascript:void(0)" data-toggle="tab" data-target="#billing" ng-click="loadInvoices()">Billing History</a></li>
         <li><a href="javascript:void(0)" data-toggle="tab" data-target="#robots">Robot Accounts</a></li>
-        <li><a href="javascript:void(0)" data-toggle="tab" data-target="#settings">Account Settings</a></li>
+        <li><a href="javascript:void(0)" data-toggle="tab" data-target="#password">Change Password</a></li>
+        <li><a href="javascript:void(0)" data-toggle="tab" data-target="#github">GitHub Login</a></li>
         <li ng-show="hasPaidBusinessPlan"><a href="javascript:void(0)" data-toggle="tab" data-target="#logs" ng-click="loadLogs()">Usage Logs</a></li>
         <li><a href="javascript:void(0)" data-toggle="tab" data-target="#migrate" id="migrateTab">Convert to Organization</a></li>
       </ul>
@@ -50,8 +51,8 @@
         </div>
 
         <!-- Change password tab -->
-        <div id="settings" class="tab-pane">
-          <div class="loading" ng-show="updatingUser || !cuser">
+        <div id="password" class="tab-pane">
+          <div class="loading" ng-show="updatingUser">
             <div class="quay-spinner 3x"></div>
           </div>
           <div class="row">
@@ -72,7 +73,12 @@
               </div>
             </div>
           </div>
+        </div>
 
+        <div id="github" class="tab-pane">
+          <div class="loading" ng-show="!cuser">
+            <div class="quay-spinner 3x"></div>
+          </div>
           <div class="row" ng-show="cuser">
             <div class="panel">
               <div class="panel-title">GitHub Login</div>