diff --git a/opentech/public/mailchimp/templates/mailchimp/newsletter_signup.html b/opentech/public/mailchimp/templates/mailchimp/newsletter_signup.html
index 4c70ae9abe8f9e980d69af7188e9d800df553056..1ce04c2bab5b8bec09b2688f2bb602de89da6f7a 100644
--- a/opentech/public/mailchimp/templates/mailchimp/newsletter_signup.html
+++ b/opentech/public/mailchimp/templates/mailchimp/newsletter_signup.html
@@ -7,7 +7,8 @@
             {% if field.field.required %}
                 <span class="form__required">*</span>
             {% endif %}
-            {{ field }}
+        </label>
+        {{ field }}
         {% endfor %}
         <div class="form-actions form-wrapper">
             <input type="submit" value="Sign up" class="form-submit link link--button-transparent link--footer-signup">
diff --git a/opentech/public/mailchimp/views.py b/opentech/public/mailchimp/views.py
index 679384d7a71ba4ffbed8d39707a035d7e8ad35b0..56534258b7d2d0f48f37929f8bc3169d08bd2666 100644
--- a/opentech/public/mailchimp/views.py
+++ b/opentech/public/mailchimp/views.py
@@ -77,7 +77,7 @@ class MailchimpSubscribeView(FormMixin, RedirectView):
 
     def get_success_url(self):
         # Go back to where you came from
-        return self.request.META['HTTP_ORIGIN']
+        return self.request.META['HTTP_REFERER']
 
     def get_redirect_url(self):
         # We don't know where you came from, go home