diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 7f75c6d25f..4fb929f501 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -235,11 +235,11 @@ def create_account(request, post_override=None):
     r.register(u)
 
     up = UserProfile(user=u)
-    up.name=post_vars['name']
-    up.language=post_vars['language']
-    up.country=post_vars['country']
-    up.gender=post_vars['gender']
-    up.mailing_address=post_vars['mailing_address']
+    up.name = post_vars['name']
+    up.language = post_vars['language']
+    up.country = post_vars['country']
+    up.gender = post_vars['gender']
+    up.mailing_address = post_vars['mailing_address']
     up.save()
 
     # TODO (vshnayder): the LMS should probably allow signups without a particular course too
diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html
index 19c3674572..2bf3497127 100644
--- a/lms/templates/signup_modal.html
+++ b/lms/templates/signup_modal.html
@@ -1,6 +1,6 @@
 <%namespace name='static' file='static_content.html'/>
 <%! from django.core.urlresolvers import reverse %>
-<%! from django_countries import countries %>
+<%! from django_countries.countries import COUNTRIES %>
 <%! from student.models import UserProfile %>
 
 <section id="signup-modal" class="modal signup-modal">
@@ -29,8 +29,8 @@
         </p>
         <label>Country of citizenship</label>
         <select name="country">
-            %for code, country in countries.COUNTRIES:
-                <option value="${code}">${country}</option>
+            %for country_code, country_name in COUNTRIES:
+                <option value="${country_code}">${country_name}</option>
             %endfor
         </select>
         <label>Preferred Language</label>