diff --git a/corporate/urls.py b/corporate/urls.py
index 3de0066451..cbd185432d 100644
--- a/corporate/urls.py
+++ b/corporate/urls.py
@@ -12,13 +12,8 @@ urlpatterns = patterns('',
     url(r'^zephyr-mirror/$', TemplateView.as_view(template_name='corporate/zephyr-mirror.html')),
 
     # Marketing
-    # Landing page, features pages, signup form, etc.
-    url(r'^hello/$', TemplateView.as_view(template_name='corporate/hello.html'),
-                                         name='landing-page'),
-    url(r'^new-user/$', RedirectView.as_view(url='/hello')),
-    url(r'^features/$', TemplateView.as_view(template_name='corporate/features.html')),
     url(r'^compare/$', TemplateView.as_view(template_name='corporate/compare.html')),
-
+    # signup form
     url(r'^signup/$', TemplateView.as_view(template_name='corporate/signup.html'),
                                          name='signup'),
     # TODO: The beta signup view should probably be moved to corporate.
diff --git a/templates/zerver/hello.html b/templates/zerver/hello.html
index a25058abca..ab065322ef 100644
--- a/templates/zerver/hello.html
+++ b/templates/zerver/hello.html
@@ -10,7 +10,11 @@
         Finally, workplace chat that actually improves your productivity.*
       </span>
       <span class="footnote">* It's also great for sharing cat pictures.</span>
-      <a href="{% url 'signup' %}" class="main-signup-button btn btn-large btn-info">Sign up now, for free!</a>
+      {% if not_enterprise %}
+        <a href="{% url 'signup' %}" class="main-signup-button btn btn-large btn-info">Sign up now, for free!</a>
+      {% else %}
+        <a href="{% url 'register' %}" class="main-signup-button btn btn-large btn-info">Register now!</a>
+      {% endif %}
     </div>
     <img src="/static/images/landing-page/laptop-screenshot.png" class="main-image">
   </div>
@@ -170,7 +174,11 @@
 
 <div class="app feature-line dark">
   <div class="app-main feature-line-container centered-content">
-        <a href="{% url 'signup' %}" class="bottom-signup-button btn btn-large btn-info">Sign up now</a>
+    {% if not_enterprise %}
+      <a href="{% url 'signup' %}" class="bottom-signup-button btn btn-large btn-info">Sign up now</a>
+    {% else %}
+      <a href="{% url 'register' %}" class="bottom-signup-button btn btn-large btn-info">Register now</a>
+    {% endif %}
   </div>
 </div>
 {% endblock %}
diff --git a/zproject/urls.py b/zproject/urls.py
index 4b3f10da1e..685091341d 100644
--- a/zproject/urls.py
+++ b/zproject/urls.py
@@ -78,6 +78,12 @@ urlpatterns = patterns('',
     url(r'^apps/$', TemplateView.as_view(template_name='zerver/apps.html')),
 
     url(r'^robots\.txt$', RedirectView.as_view(url='/static/robots.txt')),
+
+    # Landing page, features pages, signup form, etc.
+    url(r'^hello/$', TemplateView.as_view(template_name='zerver/hello.html'),
+                                         name='landing-page'),
+    url(r'^new-user/$', RedirectView.as_view(url='/hello')),
+    url(r'^features/$', TemplateView.as_view(template_name='zerver/features.html')),
 )
 
 # These are used for enterprise development. On a real enterprise instance,