diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index efc58e9324..1c680bd9e5 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -20,7 +20,7 @@ class UserProfile(models.Model):
     class Meta:
         db_table = "auth_userprofile"
 
-    GENDER_CHOICES = (('male', 'Male'), ('female', 'Female'), ('other', 'Other'))
+    GENDER_CHOICES = (('m', 'Male'), ('f', 'Female'), ('o', 'Other'))
 
     ## CRITICAL TODO/SECURITY
     # Sanitize all fields.
diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html
index 2fa0ab062b..2229ace1e6 100644
--- a/lms/templates/signup_modal.html
+++ b/lms/templates/signup_modal.html
@@ -21,8 +21,10 @@
         <input name="username" type="text" placeholder="Public Username">
         <label>Full Name</label>
         <input name="name" type="text" placeholder="Full Name">
-        <label>Your Location</label>
-        <input name="location" type="text" placeholder="Your Location">
+        <label>Mailing address</label>
+        <textarea name="mailing_address" placeholder="Mailing address"></textarea>
+        <label>Country</label>
+        <input name="country" type="text" placeholder="Country of citizenship">
         <label>Preferred Language</label>
         <input name="language" type="text" placeholder="Preferred Language">
         <label class="terms-of-service">