diff --git a/student/models.py b/student/models.py
index d28c111dfe..e70d2170a3 100644
--- a/student/models.py
+++ b/student/models.py
@@ -59,13 +59,13 @@ class Registration(models.Model):
         #self.delete()
 
 class PendingNameChange(models.Model):
-    user = models.OneToOneField(User, unique=True, db_index=True, related_name='profile')
-    new_name = models.CharField(blank=True, max_length=255, db_index=True)
-    rationale = models.CharField(blank=True, max_length=1024, db_index=True)
+    user = models.OneToOneField(User, unique=True, db_index=True)
+    new_name = models.CharField(blank=True, max_length=255)
+    rationale = models.CharField(blank=True, max_length=1024)
 
 class PendingEmailChange(models.Model):
-    user = models.OneToOneField(User, unique=True, db_index=True, related_name='profile')
-    new_email = models.CharField(blank=True, max_length=255, db_index=True)
+    user = models.OneToOneField(User, unique=True, db_index=True)
+    new_email = models.CharField(blank=True, max_length=255)
     
 
 #cache_relation(User.profile)
diff --git a/student/views.py b/student/views.py
index 5cc3a407ad..4fe31816be 100644
--- a/student/views.py
+++ b/student/views.py
@@ -261,6 +261,7 @@ def reactivation_email(request):
 
 @ensure_csrf_cookie
 def change_email_request(request):
+    ## Maske sure it checks for existing e-mail conflicts
     if not request.user.is_authenticated:
         raise Http404
     pass