diff --git a/app/views/layouts/_signupLoginModal.html.erb b/app/views/layouts/_signupLoginModal.html.erb
index 725010488bb..eccb09c6c7e 100644
--- a/app/views/layouts/_signupLoginModal.html.erb
+++ b/app/views/layouts/_signupLoginModal.html.erb
@@ -12,7 +12,7 @@
         <div class="clearfix"> <!-- clearfix class allows the modal to expand to fit the content of this div -->
           <div id="signupContainer">
             <!-- signup partial -->
-            <%= render partial: "users/create_form" %>
+            <%= render partial: "users/create_form" , locals: {caller: "modal"} %>
           </div>
 
           <div id="loginContainer">
diff --git a/app/views/users/_create_form.html.erb b/app/views/users/_create_form.html.erb
index 78d613d5b70..4e62199ef87 100644
--- a/app/views/users/_create_form.html.erb
+++ b/app/views/users/_create_form.html.erb
@@ -85,7 +85,7 @@
     <% else %>
 
     <div class="col-sm-12">
-      <%= render partial: 'users/spamaway' %>
+      <%= render partial: 'users/spamaway', locals: {caller: caller } %>
     </div>
 
       <script>
diff --git a/app/views/users/_spamaway.html.erb b/app/views/users/_spamaway.html.erb
index ee2e5670536..b65619b05e7 100644
--- a/app/views/users/_spamaway.html.erb
+++ b/app/views/users/_spamaway.html.erb
@@ -16,8 +16,8 @@
         <div class="btn-group btn-group-justified" role="group">
           <% [0,1].each_with_index do |s, j| %><% statement = turingtest[i][s] %>
             <div class="btn-group" role="group">
-              <button type="button" class="col-xs-5 btn btn-default" style="font-size:3em;text-align:left;<% if i.odd? %> background:#eef;<% end %>" id="spamaway-<%= i.to_s + j.to_s %>">
-                <%= spam.radio_button vars[i], statement %> <%= statement %>
+              <button type="button" class="col-xs-5 btn btn-default" style="font-size:3em;text-align:left;<% if i.odd? %> background:#eef;<% end %>" id="spamaway-<%= caller %>-<%= i.to_s + j.to_s %>">
+              <%= spam.radio_button vars[i], statement, { id: "spamaway_statement_#{caller}_#{i.to_s}#{j.to_s}" } %> <%= statement %>
               </button>
             </div>
           <% end %>
@@ -33,7 +33,8 @@
     <%= spam.text_area :follow_instructions, { class: "form-control col-md-6",
                                              rows: 8,
                                              tabindex: 7,
-                                             placeholder: I18n.t('users._form.dont_write_here') }
+                                             placeholder: I18n.t('users._form.dont_write_here'),
+                                             id: 'spamaway-'+caller }
     %>
 
   </div>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index becdbab861b..d38a06b43f8 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -22,7 +22,7 @@
 
   <br />
 
-   <%= render 'create_form' %> 
+   <%= render partial: 'users/create_form', locals: {caller: "signup"} %> 
 
   <br style="margin-bottom:20px;" />