diff --git a/static/js/controllers.js b/static/js/controllers.js
index 594c98ec7..9930dad0d 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -445,10 +445,16 @@ function UserAdminCtrl($scope, Restangular) {
     planDict[$scope.plans[i].stripeId] = $scope.plans[i];
   }
 
+  $('.spin').spin();
+
+  $scope.loading = true;
   var getSubscription = Restangular.one('user/plan');
   getSubscription.get().then(function(sub) {
     // User has a subscription
     $scope.subscription = sub;
+    $scope.loading = false;
+  }, function() {
+    $scope.loading = false;
   });
 
   $scope.subscribe = function(planId) {
diff --git a/static/partials/user-admin.html b/static/partials/user-admin.html
index 7a006d92b..d93540136 100644
--- a/static/partials/user-admin.html
+++ b/static/partials/user-admin.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <div class="row">
+  <div class="row" ng-hide="loading">
     <div class="col-md-4" ng-repeat='plan in plans'>
       <div class="panel" ng-class="{'panel-success': subscription.plan == plan.stripeId, 'panel-default': subscription.plan != plan.stripeId}">
         <div class="panel-heading">
@@ -18,4 +18,7 @@
       </div>
     </div>
   </div>
+  <div class="loading" ng-show="loading">
+    <div class="spin"></div>
+  </div>
 </div>
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index abeacce51..118864f33 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -70,6 +70,7 @@
               <b class="caret"></b>
             </a>
             <ul class="dropdown-menu">
+              <li><a href="#/user">User Settings</a></li>
               <li><a href="/signout">Sign out</a></li>
             </ul>
           </li>