diff --git a/src/app/helpers.coffee b/src/app/helpers.coffee
index 1429b50168..bc1795f449 100644
--- a/src/app/helpers.coffee
+++ b/src/app/helpers.coffee
@@ -56,7 +56,9 @@ module.exports.viewHelpers = (view) ->
   view.fn "tokens", (money) ->
     return money/0.25
 
-  view.fn 'currentArmor', (gender, armor, armorSet) ->
+  view.fn 'currentArmor', (user) ->
+    armor = user?.items?.armor || 0
+    {gender, armorSet} = user?.preferences || {'m', 'v1'}
     if gender == 'f'
       str = "armor#{armor}_f"
       if parseInt(armor) > 1
diff --git a/views/app/index.html b/views/app/index.html
index 36eda59f30..28978443d2 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -166,7 +166,7 @@
               <td class="avatar main-avatar">
                 <div class='avatar-sprites'>
                   <img class='weapon weapon-{_user.items.weapon}' src="/img/BrowserQuest/habitrpg_mods/weapon{_user.items.weapon}.png" />
-                  <img class='armor armor-{_user.items.armor}' src="/img/BrowserQuest/habitrpg_mods/{currentArmor(_user.preferences.gender, _user.items.armor, _user.preferences.armorSet)}" />
+                  <img class='armor armor-{_user.items.armor}' src="/img/BrowserQuest/habitrpg_mods/{currentArmor(_user)}" />
                 </div>
                 <div id="lvl"><span class="badge badge-info">Lvl {_user.stats.lvl}</span></div>
               </td>
@@ -195,7 +195,7 @@
                     <td class="avatar party-avatar" rel="tooltip" title="{username(:member.auth)}" data-placement="bottom" >
                         <div class='avatar-sprites'>
                             <img class='weapon weapon-{:member.items.weapon}' src="/img/BrowserQuest/habitrpg_mods/weapon{:member.items.weapon}.png" />
-                            <img class='armor armor-{:member.items.armor}' src="/img/BrowserQuest/habitrpg_mods/{currentArmor(:member.preferences.gender, :member.items.armor, :member.preferences.armorSet)}" />
+                            <img class='armor armor-{:member.items.armor}' src="/img/BrowserQuest/habitrpg_mods/{currentArmor(:member)}" />
                         </div>
                         <div id="lvl"><span class="badge badge-info">Lvl {:member.stats.lvl}</span></div>
                     </td>