diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 2ceab80a84..ef4255f4cc 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,5 +1,5 @@
 <div class="col-md-3">
-  
+
 <%= raw t('users.new.about_public_lab') %>
 
 </div>
@@ -24,15 +24,9 @@
 
   <%= render 'form' %>
 
-  <div style="clear:both;padding-top:10px;">
-    <p><b><%= t('users.new.code_of_conduct_agreement') %></b></p>
-    <p><%= raw t('users.new.code_of_conduct_detail', :url1 => "http://publiclab.org/conduct") %></p>
-  </div>
-
-  <div style="clear:both;padding-top:10px;">
-    <p><b><%= t('users.new.licensing_agreement') %></b></p>
-    <p> <%= raw t('users.new.licensing_detail', :url1 => "http://creativecommons.org/licenses/by-sa/3.0/", :url2 => "http://www.ohwr.org/cernohl", :url3 => "http://creativecommons.org/licenses/by-sa/3.0/") %></p>
-  </div>
+  <% cache('feature_signup-notice', skip_digest: true) do %>
+   <%= feature('signup-notice') %>
+  <% end %>
 
   <br style="margin-bottom:20px;" />