diff --git a/web/app/assets/stylesheets/web/main.css.scss b/web/app/assets/stylesheets/web/main.css.scss
index c680de296..6abeebc01 100644
--- a/web/app/assets/stylesheets/web/main.css.scss
+++ b/web/app/assets/stylesheets/web/main.css.scss
@@ -106,6 +106,10 @@ body.web {
       margin-right:0px;
     }
 
+    input.button-orange {
+      height:26px;
+    }
+
     .button-grey:hover {
       cursor:default;
       background-color:#666;
@@ -290,10 +294,6 @@ body.web {
 
     .actions {
       margin-top:20px;
-
-      a.button-grey {
-        line-height:15px; // WHY is this not universal
-      }
     }
 
     .error {
@@ -332,9 +332,6 @@ body.web {
 
     }
 
-
-
-
     .right-side {
       margin-left:25px;
     }
diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb
index c80d709e2..1420b2012 100644
--- a/web/app/controllers/users_controller.rb
+++ b/web/app/controllers/users_controller.rb
@@ -232,15 +232,16 @@ class UsersController < ApplicationController
       UserMailer.welcome_message(@user).deliver
       sign_in @user
       redirect_to :client
+      return
     elsif !@user.nil?
       # new user with validation errors;
       logger.debug("#{@user} has errors. can not sign in until remedied.  #{@user.errors.inspect}")
-
     end
     # let page have signup_token in javascript
     gon.signup_token = signup_token
 
     # let errors fall through to signup_confirm.html.erb
+    render :layout => 'web'
   end
 
   def edit
diff --git a/web/app/views/users/signup_confirm.html.erb b/web/app/views/users/signup_confirm.html.erb
index ead385897..0070ca9dd 100644
--- a/web/app/views/users/signup_confirm.html.erb
+++ b/web/app/views/users/signup_confirm.html.erb
@@ -2,116 +2,17 @@
 <%=  javascript_include_tag "landing/landing" %>
 
 <% if @user.nil? %>
-    <h1>Signup Confirmation Failure</h1>
+    <h1>Signup Already Confirmed</h1>
 
-    <div class="row">
-      <div class="span6 offset3">
-        Unable to confirm registration email
-      </div>
-    </div>
+  <br/>
+  <br/>
+  <p>
+    If you are seeing this page, you have probably already confirmed this email address.
+  </p>
+  <br/>
+  <p>
+    Please proceed to <%= link_to 'the home page', root_path %> and log in.
+  </p>
 <% else %>
-    <%  # Seth: I'm commenting out all non-required fields for now, because I think we currently have too much %>
-
-    <div class="signin-overlay">
-
-      <!-- ftue header -->
-      <div class="content-head">
-        <h1>create a jamkazam account</h1>
-      </div>
-
-      <!-- inner wrapper -->
-      <div class="ftue-inner">
-        <%= form_for(@user) do |f| %>
-
-            <!-- register left column -->
-            <div class="ftue-left">
-              <div id="errors"></div>
-              <table height="330" cellpadding="0" cellspacing="10">
-                <tr>
-                  <td><%= f.label :first_name, "First Name" %><br />
-                    <%= f.text_field :first_name %></td>
-                  <td><%= f.label :last_name, "Last Name" %><br />
-                    <%= f.text_field :last_name %></td>
-                </tr>
-                <tr>
-                  <td><%= f.label :email %><br />
-                    <%= f.text_field :email, :disabled => true %></td>
-
-                  <td>Country:<br />
-                    <select id="jam_ruby_user_country" name="jam_ruby_user_country"><option value="US">United States</option></select>
-                  </td>
-
-                </tr>
-                <tr>
-                  <td>State/Province:<br />
-                    <select id="jam_ruby_user_state" name="jam_ruby_user_state"><option>Select State/Province</option></select></td>
-                  <td>City:<br />
-                    <select id="jam_ruby_user_city" name="jam_ruby_user_city"><option>Select City</option></select></td>
-                </tr>
-
-                <tr>
-                  <td><%= f.label :password %><br/>
-                    <%= f.password_field :password %></td>
-                  <td><%= f.label :password_confirmation, "Verify Password" %><br/>
-                    <%= f.password_field :password_confirmation %></td>
-                </tr>
-                <!--
-                <tr>
-                  <td colspan="2">
-                    <%= f.label :birth_date %>
-                    <%= f.date_select :birth_date,
-                                      :start_year => 1900,
-                                      :prompt => { :day => 'Select day', :month => 'Select month', :year => 'Select year' },
-                                      :order => [:month, :day, :year]%></td>
-                </tr>
-                 -->
-
-                <tr>
-                  <td colspan=2><small><input type="checkbox" /> I will accept email from JamKazam about this service.<br />
-                    <br />
-                    <input type="checkbox" /> I have read and agree to the JamKazam <%= link_to "terms of service", corp_terms_path , :rel=>"external" %>.</small>
-
-              </table>
-
-
-            </div><!-- end left column -->
-
-            <!-- sign in right column -->
-            <div class="ftue-right"><br />
-
-              What instruments can you play?
-
-              <div class="ftue-instrumentlist">
-                <%=  render :partial => "instrument_selector"%>
-              </div>
-
-              <br />
-              <% if Rails.application.config.recaptcha_enable %>
-                  <%= recaptcha_tags %>
-              <% end %>
-
-              <!--
-            <img src="images/content/captcha.png" width="152" height="50" align="left" class="mr10" /><small>Enter the characters from the box to the left:<br />
-                <input type="text" /> <br clear="all" /><br />
-                -->
-
-              <%= f.submit "CREATE ACCOUNT", class: "right button-orange", id: "completion_submit_button" %><br/ style="clear:both;"><br/>
-                  <a href="/auth/facebook" class="right"><img src="/fb-signup-button.png"></a>
-
-                  </div>
-
-                  </div>
-                  <!-- end right column -->
-
-              <% end %>
-              </div>
-              <!-- end inner -->
-
-              </div>
-
-      <% end %>
-
-<script type="text/javascript">
-    // register for submit attempts
-    window.signup.handle_completion_submit()
-</script>
+  The server had a problem. Please try to confirm your email later.
+<% end %>
diff --git a/web/config/environments/production.rb b/web/config/environments/production.rb
index 53083251b..3685fe7dc 100644
--- a/web/config/environments/production.rb
+++ b/web/config/environments/production.rb
@@ -9,7 +9,7 @@ SampleApp::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.serve_static_assets = true # in true production we use false, but in 'fake production mode locally', this is useful
 
   # Compress JavaScripts and CSS
   config.assets.compress = false # this seems like a bad idea in early development phases