diff --git a/src/app/index.coffee b/src/app/index.coffee
index 356a207e9f..b649e75a7e 100644
--- a/src/app/index.coffee
+++ b/src/app/index.coffee
@@ -24,11 +24,12 @@ setupModelFns = (model) ->
     # also update in scoring.coffee. TODO create a function accessible in both locations
     (lvl*100)/5
 
-  model.fn '_user._armor', '_user.items.armor', '_user.preferences.gender', (armor, gender) ->
+  model.fn '_user._armor', '_user.items.armor', '_user.preferences.armorSet', '_user.preferences.gender', (armor, armorSet, gender) ->
     if gender == 'f'
       str = "armor#{armor}_f"
       if parseInt(armor) > 1
-        str += '_v1' #TODO implement different version
+        armorSet = if armorSet then armorSet else 'v1'
+        str += '_' + armorSet
       return "#{str}.png"
     else
       "armor#{armor}_m.png"
@@ -315,4 +316,6 @@ ready (model) ->
     user.set('notifications.kickstarter', 'hide')
 
   exports.setMale = -> user.set('preferences.gender', 'm')
-  exports.setFemale = -> user.set('preferences.gender', 'f')
\ No newline at end of file
+  exports.setFemale = -> user.set('preferences.gender', 'f')
+  exports.setArmorsetV1 = -> user.set('preferences.armorSet', 'v1')
+  exports.setArmorsetV2 = -> user.set('preferences.armorSet', 'v2')
\ No newline at end of file
diff --git a/views/app/index.html b/views/app/index.html
index 7848dcb3ca..f9bd1f0309 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -12,6 +12,7 @@
           <small>Copy this ID for use in third party applications.</small>
           <pre class=prettyprint>{_user.id}</pre><br/>
 
+          <h4>Gender</h4>
           <label class="radio">
               <input type="radio" name="genderRadios" value="m" x-bind="click:setMale" checked="{equal(_user.preferences.gender,'m')}">
               Male
@@ -21,6 +22,19 @@
               Female
           </label>
 
+
+          {#if equal(_user.preferences.gender,'f')}
+              <h4>Armor Set</h4>
+              <label class="radio">
+                  <input type="radio" name="armorSet" value="v1" x-bind="click:setArmorsetV1" checked="{equal(_user.preferences.armorSet,'v1')}">
+                  v1
+              </label>
+              <label class="radio">
+                  <input type="radio" name="armorSet" value="v2" x-bind="click:setArmorsetV2" checked="{equal(_user.preferences.armorSet,'v2')}">
+                  v2
+              </label>
+          {/}
+
           <@footer>
               <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
           </@footer>