diff --git a/app/assets/javascripts/controllers/user_index_controller.js.coffee b/app/assets/javascripts/controllers/user_index_controller.js.coffee
index 350369ae5..5a91fedae 100644
--- a/app/assets/javascripts/controllers/user_index_controller.js.coffee
+++ b/app/assets/javascripts/controllers/user_index_controller.js.coffee
@@ -1,6 +1,9 @@
 Hummingbird.UserIndexController = Ember.ArrayController.extend
   needs: "user"
   user: Ember.computed.alias('controllers.user')
+  hasWaifu: Ember.computed.any('user.waifu')
+  hasLocation: Ember.computed.any('user.location')
+  hasWebsite: Ember.computed.any('user.website')
 
   sortProperties: ['createdAt']
   sortAscending: false
@@ -10,6 +13,8 @@ Hummingbird.UserIndexController = Ember.ArrayController.extend
   favorite_anime_page: 1
   isEditing: false  
   editingFavorites: false
+  selectChoices: ["Waifu", "Husbando"] 
+ 
   can_load_more:(->
     page = @get('favorite_anime_page')
     if (page*6 + 1 <= @get('favorite_anime').length)
diff --git a/app/assets/javascripts/models/user.js.coffee b/app/assets/javascripts/models/user.js.coffee
index 3f372114a..21c889c07 100644
--- a/app/assets/javascripts/models/user.js.coffee
+++ b/app/assets/javascripts/models/user.js.coffee
@@ -8,7 +8,7 @@ Hummingbird.User = DS.Model.extend
   location: DS.attr('string')
   website: DS.attr('string')
   waifu: DS.attr('string')
-  waifu_or_husbando: DS.attr('boolean', default: false)
+  waifuOrHusbando: DS.attr('string')
   ratingType: DS.attr('string')
 
   isFollowed: DS.attr('boolean')
diff --git a/app/assets/javascripts/templates/user/index.emblem b/app/assets/javascripts/templates/user/index.emblem
index 4039ff49c..854f1ba73 100755
--- a/app/assets/javascripts/templates/user/index.emblem
+++ b/app/assets/javascripts/templates/user/index.emblem
@@ -14,12 +14,14 @@
 
         .panel-body
           if isEditing
-            == textarea class="edit-bio" rows="3" placeholder="Tell us about yourself  :3" value=user.bio
+            == textarea class="edit-bio" rows="3" placeholder="Tell us about yourself  :3" value=user.miniBio
             .user-interests
               ul
                 li
                   .interest-icon <i class="fa fa-heart"></i>
-                  .interest #{input type="text" placeholder="Waifu" value=user.waifu}
+                  p choice: #{user.waifuOrHusbando}
+                  .interest
+                    | {{{view Ember.Select content=selectChoices selection=user.waifuOrHusbando}}}
                 li
                   .interest-icon <i class="fa fa-home"></i>
                   .interest #{input type="text" placeholder="Location" value=user.location}
@@ -33,7 +35,10 @@
               ul
                 li
                   .interest-icon <i class="fa fa-heart"></i>
-                  .interest Waifu is <a href="#"> #{user.waifu} </a>
+                  if hasWaifu
+                    .interest #{user.waifuOrHusbando} is <a href="#"> #{user.waifu} </a>
+                  else
+                    .interest Waifu/Husbando Not Selected
                 li
                   .interest-icon <i class="fa fa-home"></i>
                   .interest Lives in <strong>#{user.location}</strong>
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6dd24a56f..e63481c6d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -246,7 +246,7 @@ def update
       user.waifu = params[:user][:waifu]
       user.website = params[:user][:website]
       user.waifu_or_husbando = params[:user][:waifu_or_husbando]
-      user.bio = params[:user][:bio]
+      user.bio = params[:user][:mini_bio]
 
       if Rails.env.production? and params[:user][:cover_image_url] =~ /^data:image/
         user.cover_image = params[:user][:cover_image_url]
diff --git a/app/models/user.rb b/app/models/user.rb
index c414c2e6f..8683ed1a0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -54,7 +54,7 @@
 #  location                    :string
 #  website                     :string
 #  waifu                       :string
-#  waifu_or_husbando           :boolean          default(FALSE) TRUE = Husbando
+#  waifu_or_husbando           :string
 
 
 class User < ActiveRecord::Base
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 5764ea0e8..7c5b5226a 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -1,5 +1,5 @@
 class UserSerializer < ActiveModel::Serializer
-  attributes :id, :cover_image_url, :avatar_template, :rating_type, :mini_bio, :is_followed, :title_language_preference, :online, :waifu, :location, :website
+  attributes :id, :cover_image_url, :avatar_template, :rating_type, :mini_bio, :is_followed, :title_language_preference, :online, :waifu, :location, :website, :waifu_or_husbando
 
   def id
     object.name
diff --git a/db/structure.sql b/db/structure.sql
index 715ca5cdc..fc85a86db 100755
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1280,7 +1280,7 @@ CREATE TABLE users (
     waifu character varying(255),
     location character varying(255),
     website character varying(255),
-    waifu_or_husbando boolean DEFAULT false
+    waifu_or_husbando character varying(255)
 );