Merge branch 'daniel/cherry-pick'
diff --git a/app/soc/modules/gsoc/views/homepage.py b/app/soc/modules/gsoc/views/homepage.py
index e0a8390..b905856 100644
--- a/app/soc/modules/gsoc/views/homepage.py
+++ b/app/soc/modules/gsoc/views/homepage.py
@@ -153,7 +153,7 @@
         context['student_signup_start'] = (
             self.data.timeline.studentSignupStart())
 
-      context['active_student_singup'] = self.data.timeline.studentSignup()
+      context['active_student_signup'] = self.data.timeline.studentSignup()
 
     context['student_signup'] = self.data.timeline.studentSignup()
     context['mentor_signup'] = self.data.timeline.mentorSignup()
diff --git a/app/soc/templates/modules/gsoc/homepage/_active_org_member_signup.html b/app/soc/templates/modules/gsoc/homepage/_active_org_member_signup.html
index cc993c5..581c27d 100644
--- a/app/soc/templates/modules/gsoc/homepage/_active_org_member_signup.html
+++ b/app/soc/templates/modules/gsoc/homepage/_active_org_member_signup.html
@@ -1,18 +1,20 @@
-<h3>Mentors & Administrators</h3>
-<p id="block-apply-text-action" class="description">
-Registration with participating organizations is now open.
-</p>
-{% if login_link %}
-<p id="block-apply-text-action" class="action">
-  <a href="{{ login_link }}">Log in</a>
-</p>
-with your Google account to begin.
-{% elif has_profile %}
-<p id="block-apply-text-action" class="action">
-  <a href="{{ start_connection_url }}">Start connection</a>
-</p>
-{% else %}
-<p id="block-apply-text-action" class="action">
-  <a href="{{ org_member_profile_url }}">Create profile</a>
-</p>
+{% if not has_profile or not is_student %}
+  <h3>Mentors & Administrators</h3>
+  <p id="block-apply-text-action" class="description">
+  Registration with participating organizations is now open.
+  </p>
+  {% if login_link %}
+  <p id="block-apply-text-action" class="action">
+    <a href="{{ login_link }}">Log in</a>
+  </p>
+  with your Google account to begin.
+  {% elif has_profile %}
+  <p id="block-apply-text-action" class="action">
+    <a href="{{ start_connection_url }}">Start connection</a>
+  </p>
+  {% else %}
+  <p id="block-apply-text-action" class="action">
+    <a href="{{ org_member_profile_url }}">Create profile</a>
+  </p>
+  {% endif %}
 {% endif %}
diff --git a/app/soc/templates/modules/gsoc/homepage/_active_student_signup.html b/app/soc/templates/modules/gsoc/homepage/_active_student_signup.html
index 27a4e4a..180400e 100644
--- a/app/soc/templates/modules/gsoc/homepage/_active_student_signup.html
+++ b/app/soc/templates/modules/gsoc/homepage/_active_student_signup.html
@@ -1,19 +1,21 @@
-<h3>Students</h3>
-<p id="block-apply-text-action" class="description">
-Registration is open
-</p>
-{% if login_link %}
-<p id="block-apply-text-action" class="action">
-  <a href="{{ login_link }}">Log in</a>
-</p>
-with your Google account to begin.
-{% elif has_profile %}
-<!-- TODO(daniel): ask for forms -->
-{% else %}
-<p id="block-apply-text-action" class="action">
-  <a href="{{ student_profile_url }}">Create profile</a>
-</p>
-before you can submit your forms and submit proposals.
+{% if not has_profile or is_student %}
+  <h3>Students</h3>
+  <p id="block-apply-text-action" class="description">
+  Registration is open
+  </p>
+  {% if login_link %}
+  <p id="block-apply-text-action" class="action">
+    <a href="{{ login_link }}">Log in</a>
+  </p>
+  with your Google account to begin.
+  {% elif has_profile %}
+  <!-- TODO(daniel): ask for forms -->
+  {% else %}
+  <p id="block-apply-text-action" class="action">
+    <a href="{{ student_profile_url }}">Create profile</a>
+  </p>
+  before you can submit your forms and submit proposals.
+  {% endif %}
 {% endif %}