diff --git a/common/locales/en/pets.json b/common/locales/en/pets.json
index fd5ab9e84f..b758c39c9f 100644
--- a/common/locales/en/pets.json
+++ b/common/locales/en/pets.json
@@ -1,6 +1,7 @@
 {
     "pets": "Pets",
     "activePet": "Active Pet",
+    "noActivePet": "No Active Pet",
     "petsFound": "Pets Found",
     "magicPets": "Magic Potion Pets",
     "rarePets": "Rare Pets",
diff --git a/website/views/shared/profiles/stats.jade b/website/views/shared/profiles/stats.jade
index c728819759..4e4c404ea5 100644
--- a/website/views/shared/profiles/stats.jade
+++ b/website/views/shared/profiles/stats.jade
@@ -13,7 +13,9 @@ mixin statList(calculatedStat, popover, text, useOneTimeBinding)
     =': {{' + binding + calculatedStat + '}}'
 
 include ./stats/basic-stats
-include ./stats/equipment
-include ./stats/costume
 include ./stats/attributes
+include ./stats/equipment
 include ./stats/pets-and-mounts
+hr
+include ./stats/costume
+include ./stats/active-pet-and-mount
\ No newline at end of file
diff --git a/website/views/shared/profiles/stats/active-pet-and-mount.jade b/website/views/shared/profiles/stats/active-pet-and-mount.jade
new file mode 100644
index 0000000000..4c54a1de18
--- /dev/null
+++ b/website/views/shared/profiles/stats/active-pet-and-mount.jade
@@ -0,0 +1,5 @@
+div(ng-show='user._id != profile._id')
+  h4
+  table.table.table-striped
+    +basicRow('activePet', '{{::profile.items.currentPet ? (isBasicAnimal(profile.items.currentPet, \'pet\') ? env.t(\'petName\', {potion: Content.hatchingPotions[petPotion].text(), egg: Content.eggs[petEgg].text()}) : env.t(Content.specialPets[profile.items.currentPet])) : env.t(\'noActivePet\')}}')
+    +basicRow('activeMount', '{{::profile.items.currentMount ? (isBasicAnimal(profile.items.currentMount, \'mount\') ? env.t(\'mountName\', {potion: Content.hatchingPotions[mountPotion].text(), mount: Content.eggs[mountEgg].text()}) : env.t(Content.specialMounts[profile.items.currentMount])) : env.t(\'noActiveMount\')}}')
\ No newline at end of file
diff --git a/website/views/shared/profiles/stats/costume.jade b/website/views/shared/profiles/stats/costume.jade
index 01b3b88aaf..2024b1548d 100644
--- a/website/views/shared/profiles/stats/costume.jade
+++ b/website/views/shared/profiles/stats/costume.jade
@@ -1,7 +1,6 @@
-h4(ng-show='profile.preferences.costume')=env.t('costume')
-table.table.table-striped(ng-show='profile.preferences.costume')
-  tr(ng-repeat='(itemType,costume) in profile.items.gear.costume', ng-init='piece=Content.gear.flat[costume]', ng-show='piece')
-    td
-      strong {{piece.text()}}
-  +basicRow('activePet', '{{::isBasicAnimal(profile.items.currentPet, \'pet\') ? env.t(\'petName\', {potion: Content.hatchingPotions[petPotion].text(), egg: Content.eggs[petEgg].text()}) : env.t(Content.specialPets[profile.items.currentPet])}}')(ng-if='user._id != profile._id && profile.items.currentPet')
-  +basicRow('activeMount', '{{::isBasicAnimal(profile.items.currentMount, \'mount\') ? env.t(\'mountName\', {potion: Content.hatchingPotions[mountPotion].text(), mount: Content.eggs[mountEgg].text()}) : env.t(Content.specialMounts[profile.items.currentMount])}}')(ng-if='user._id != profile._id && profile.items.currentMount')
\ No newline at end of file
+div(ng-show='profile.preferences.costume')
+  h4=env.t('costume')
+  table.table.table-striped
+    tr(ng-repeat='(itemType,costume) in profile.items.gear.costume', ng-init='piece=Content.gear.flat[costume]', ng-show='piece')
+      td
+        strong {{piece.text()}}
\ No newline at end of file