diff --git a/public/js/controllers/inventoryCtrl.js b/public/js/controllers/inventoryCtrl.js
index ea39a88b3b..a206f86bf7 100644
--- a/public/js/controllers/inventoryCtrl.js
+++ b/public/js/controllers/inventoryCtrl.js
@@ -127,6 +127,8 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
           if (!confirm('Saddle ' + pet + '?')) return;
           userPets[pet] = 0;
           setObj['items.mounts.' + pet] = true;
+          if (pet == user.items.currentPet)
+            setObj['items.currentPet'] = '';
           Notification.text('You have tamed '+egg+", let's go for a ride!");
         } else {
           if (userPets[pet] >= 150)
@@ -149,7 +151,7 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
       } else {
         var userCurrentPet = User.user.items.currentPet;
         if(userCurrentPet && userCurrentPet == pet){
-          User.user.items.currentPet = null;
+          User.user.items.currentPet = '';
         }else{
           User.user.items.currentPet = pet;
         }
@@ -159,7 +161,7 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
 
     $scope.chooseMount = function(egg, potion) {
       var mount = egg + '-' + potion;
-      User.set('items.currentMount', (user.items.currentMount == mount) ? null : mount);
+      User.set('items.currentMount', (user.items.currentMount == mount) ? '' : mount);
     }
 
   }
diff --git a/public/js/services/guideServices.js b/public/js/services/guideServices.js
index 964ccdffc9..ebb9cadb36 100644
--- a/public/js/services/guideServices.js
+++ b/public/js/services/guideServices.js
@@ -105,7 +105,7 @@ angular.module('guideServices', []).
     $rootScope.$watch('user.flags.dropsEnabled', function(after, before) {
       if (alreadyShown(before, after)) return;
       var eggs = User.user.items.eggs || {};
-      eggs['Wolf-Base'] = 5; // This is also set on the server
+      eggs['Wolf'] = 1; // This is also set on the server
       $rootScope.modals.dropsEnabled = true;
     });
 
diff --git a/views/shared/header/avatar.jade b/views/shared/header/avatar.jade
index 9ee9527b33..5df250fa8f 100644
--- a/views/shared/header/avatar.jade
+++ b/views/shared/header/avatar.jade
@@ -1,4 +1,9 @@
-figure.herobox(ng-click='clickMember(profile._id)', data-name='{{profile.profile.name}}', ng-class='{isUser: profile.id==user.id, hasPet: profile.items.currentPet}', data-level='{{profile.stats.lvl}}', data-uid='{{profile.id}}', rel='popover', data-placement='bottom', data-trigger='hover', data-html='true', data-content="<div ng-hide='profile.id == user.id'> <div class='progress progress-danger' style='height:5px;'> <div class='bar' style='height: 5px; width: {{percent(profile.stats.hp, 50)}}%;'></div> </div> <div class='progress progress-warning' style='height:5px;'> <div class='bar' style='height: 5px; width: {{percent(profile.stats.exp, tnl(profile.stats.lvl))}}%;'></div> </div> <div>Level: {{profile.stats.lvl}}</div> <div>GP: {{profile.stats.gp | number:0}}</div> <div>{{count(profile.items.pets)}} / 90 Pets Found</div> </div>")
+//- FIXME the commented-out figure.herobox used to have a functioning popover, but angular-ui-bootstrap doesn't support
+    html in popovers. Figure out what to do here. Also, {isUser:..} class seems to bring the user too far down with mounts.
+    Removing it will remove the user's name, but will allow more room for mounts & helms. IMO this is the lesser of two evils, revisit
+//-figure.herobox(ng-click='clickMember(profile._id)', data-name='{{profile.profile.name}}', ng-class='{isUser: profile.id==user.id, hasPet: profile.items.currentPet}', data-level='{{profile.stats.lvl}}', data-uid='{{profile.id}}', rel='popover', data-placement='bottom', data-trigger='hover', data-html='true', data-content="<div ng-hide='profile.id == user.id'> <div class='progress progress-danger' style='height:5px;'> <div class='bar' style='height: 5px; width: {{percent(profile.stats.hp, 50)}}%;'></div> </div> <div class='progress progress-warning' style='height:5px;'> <div class='bar' style='height: 5px; width: {{percent(profile.stats.exp, tnl(profile.stats.lvl))}}%;'></div> </div> <div>Level: {{profile.stats.lvl}}</div> <div>GP: {{profile.stats.gp | number:0}}</div> <div>{{count(profile.items.pets)}} / 90 Pets Found</div> </div>")
+
+figure.herobox(ng-click='clickMember(profile._id)', data-name='{{profile.profile.name}}', ng-class='{isUser: user._id==profile._id && !(user.items.currentMount && user.items.currentPet), hasPet: profile.items.currentPet && profile.items.currentMount}')
   .character-sprites
     // Mount Body
     span(class='Mount_Body_{{profile.items.currentMount}}')