diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb
index 4956d1958..c35db3dd2 100644
--- a/ruby/lib/jam_ruby/models/user.rb
+++ b/ruby/lib/jam_ruby/models/user.rb
@@ -909,6 +909,7 @@ module JamRuby
       fb_signup = options[:fb_signup]
       signup_confirm_url = options[:signup_confirm_url]
       affiliate_referral_id = options[:affiliate_referral_id]
+      recaptcha_failed = options[:recaptcha_failed]
 
       user = User.new
 
@@ -1031,6 +1032,12 @@ module JamRuby
             UserMailer.confirm_email(user, signup_confirm_url.nil? ? nil : (signup_confirm_url + "/" + user.signup_token) ).deliver
           end
         end
+
+        if recaptcha_failed
+          user.errors.add "recaptcha", "verification failed"
+          raise ActiveRecord::Rollback
+        end
+
       end
 
       return user
diff --git a/web/Gemfile b/web/Gemfile
index 1443a1822..eda57ee0a 100644
--- a/web/Gemfile
+++ b/web/Gemfile
@@ -50,7 +50,6 @@ gem 'signet', '0.5.0'
 gem 'twitter'
 gem 'fb_graph', '2.5.9'
 gem 'sendgrid', '1.2.0'
-gem 'recaptcha', '0.3.4'
 gem 'filepicker-rails', '0.1.0'
 gem 'aws-sdk' #, '1.29.1'
 gem 'aasm', '3.0.16'
@@ -66,6 +65,7 @@ gem 'postgres-copy'
 #end
 gem 'geokit-rails'
 gem 'postgres_ext'
+gem 'recaptcha', '0.3.6'
 gem 'resque'
 gem 'resque-retry'
 gem 'resque-failed-job-mailer'
diff --git a/web/README.md b/web/README.md
index 5aca8b9bf..ae45c560b 100644
--- a/web/README.md
+++ b/web/README.md
@@ -1,4 +1,5 @@
-== TODO: 
+TODO: 
+====
 
 Jasmine Javascript Unit Tests
 =============================
diff --git a/web/app/assets/stylesheets/web/main.css.scss b/web/app/assets/stylesheets/web/main.css.scss
index bd5bc2fc5..291f61967 100644
--- a/web/app/assets/stylesheets/web/main.css.scss
+++ b/web/app/assets/stylesheets/web/main.css.scss
@@ -67,7 +67,7 @@ body.web {
   .landing-content {
     background-color:black;
     width:100%;
-    min-height: 366px;
+    min-height: 460px;
     position:relative;
     padding-bottom:30px;
 
diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb
index c2d92c062..407b9a4c0 100644
--- a/web/app/controllers/users_controller.rb
+++ b/web/app/controllers/users_controller.rb
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 require 'builder'
+require 'recaptcha/rails'
 
 class Slide
   attr_accessor :img_url, :header, :vid_url
@@ -133,14 +134,7 @@ class UsersController < ApplicationController
     @invited_user = load_invited_user(params)
     @signup_postback = load_postback(@invited_user, @fb_signup)
 
-    @user = User.new
-
-    # check recaptcha; if any errors seen, contribute it to the model
-    unless verify_recaptcha(:model => @user, :message => "recaptcha")
-      render 'new', :layout => 'web'
-      return
-    end
-
+    
     instruments = fixup_instruments(params[:jam_ruby_user][:instruments])
 
     birth_date = fixup_birthday(params[:jam_ruby_user]["birth_date(2i)"], params[:jam_ruby_user]["birth_date(3i)"], params[:jam_ruby_user]["birth_date(1i)"])
@@ -148,6 +142,10 @@ class UsersController < ApplicationController
     terms_of_service = params[:jam_ruby_user][:terms_of_service].nil? || params[:jam_ruby_user][:terms_of_service] == "0"? false : true
     musician = params[:jam_ruby_user][:musician]
 
+    if Rails.application.config.recaptcha_enable
+      recaptcha_failed = verify_recaptcha(:private_key=>Rails.application.config.recaptcha_private_key, :timeout=>10)      
+    end
+        
     @user = UserManager.new.signup(remote_ip: request.remote_ip,
                                    first_name: params[:jam_ruby_user][:first_name],
                                    last_name: params[:jam_ruby_user][:last_name],
@@ -159,11 +157,12 @@ class UsersController < ApplicationController
                                    birth_date: birth_date,
                                    location: location,
                                    musician: musician,
+                                   recaptcha_failed: recaptcha_failed,
                                    invited_user: @invited_user,
                                    fb_signup: @fb_signup,
                                    signup_confirm_url: ApplicationHelper.base_uri(request) + "/confirm",
                                    affiliate_referral_id: AffiliatePartner.coded_id(self.affiliate_code))
-
+        
     # check for errors
     if @user.errors.any?
       # render any @user.errors on error
@@ -486,5 +485,5 @@ JS
     else
       signup_path
     end
-  end
+  end  
 end
diff --git a/web/app/views/layouts/web.html.erb b/web/app/views/layouts/web.html.erb
index 62c2f1ec6..e3e828bc4 100644
--- a/web/app/views/layouts/web.html.erb
+++ b/web/app/views/layouts/web.html.erb
@@ -132,6 +132,7 @@
     <%= render "shared/ga" %>
     <%= render "shared/twttr" %>
     <%= render "shared/facebook_sdk" %>
+    <%= render "shared/google_nocaptcha" %>
     <!-- version: <%= version %> -->
   </body>
 </html>
diff --git a/web/app/views/shared/_google_nocaptcha.html.slim b/web/app/views/shared/_google_nocaptcha.html.slim
new file mode 100644
index 000000000..c0df3c331
--- /dev/null
+++ b/web/app/views/shared/_google_nocaptcha.html.slim
@@ -0,0 +1 @@
+script src="https://www.google.com/recaptcha/api.js" async defer
\ No newline at end of file
diff --git a/web/app/views/users/new.html.erb b/web/app/views/users/new.html.erb
index 83f79f482..102fafd0b 100644
--- a/web/app/views/users/new.html.erb
+++ b/web/app/views/users/new.html.erb
@@ -6,7 +6,6 @@
 
   <%= form_for(@user, :url => @signup_postback, :method => :post) do |f| %>
 
-      <!-- register left column -->
       <div class="register-left left w45">
         <div class="register-container">
           <div class="register-as">
@@ -38,7 +37,7 @@
           <div class="field country right-side">
             <%= f.label :country, "Country:" %>
             <select id="country_select" name="jam_ruby_user[country]" autocomplete="off" class="easydropdown">
-              <option class="label" value="" <%= @location[:country].blank? ? "selected" : "" %>>Select Country</option>
+              <option class="label" value="" <%= (@location.nil? || @location[:country].nil? || @location[:country].blank?) ? "selected" : "" %>>Select Country</option>
               <% @countriesx.each do |country| %>
                   <% unless country[:countrycode].blank? %>
                       <option value="<%= country[:countrycode] %>" <%= @location[:country] == country[:countrycode] ? "selected" : "" %>><%= country[:countryname] %></option>
@@ -125,9 +124,12 @@
           </small>
         </div>
 
-        <% if Rails.application.config.recaptcha_enable %>
-            <%= recaptcha_tags %>
-        <% end %>
+        <div class="field recaptcha">
+          <% if Rails.application.config.recaptcha_enable %>
+            <div id="recaptcha_select" name="recaptcha_response_field" class="g-recaptcha" data-sitekey="<%=Rails.application.config.recaptcha_public_key%>">
+            </div>
+          <% end %>
+        </div>
 
         <!--
       <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 />
@@ -192,6 +194,7 @@
         var country = get_first_error("country")
         var state = get_first_error("state")
         var city = get_first_error("city")
+        var recaptcha = get_first_error("recaptcha")
 
 
         if (email) {
@@ -230,7 +233,12 @@
             cityInput.after("<div class='error-text'>" + city + "</div>")
         }
 
-
+        if (recaptcha) {
+            var recaptchaInput = $('#recaptcha_select');
+            recaptchaInput.closest('div.field').addClass('error')
+            recaptchaInput.after("<div class='error-text'>" + recaptcha + "</div>")
+        }
+        
         if (musician_instruments) {
             var musicianInstrumentsInput = $('#instrument_selector');
             musicianInstrumentsInput.closest('div.ftue-instrumentlist-wrapper').addClass('error')
diff --git a/web/config/application.rb b/web/config/application.rb
index 54e13bff3..ae3f2a508 100644
--- a/web/config/application.rb
+++ b/web/config/application.rb
@@ -95,7 +95,11 @@ if defined?(Bundler)
     config.filepicker_upload_dir = 'avatars'
     config.fp_secret = 'FTDL4TYDENBWZKK3UZCFIQWXS4'
 
-    config.recaptcha_enable = false
+    config.recaptcha_enable = true
+    # created using seth@jamkazam.com; can't see way to delegate
+    config.recaptcha_public_key  = '6Let8dgSAAAAAFheKGWrs6iaq_hIlPOZ2f3Bb56B'
+    config.recaptcha_private_key = '6Let8dgSAAAAAJzFxL9w2QR5auxjk0ol1_xAtOGO'
+
 
     # create one user per real jamkazam employee?
     config.bootstrap_dev_users = true
diff --git a/web/config/initializers/recaptcha.rb b/web/config/initializers/recaptcha.rb
deleted file mode 100644
index b7c4fd0f6..000000000
--- a/web/config/initializers/recaptcha.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# this gem turns recaptcha verification off during tests by default.
-# The public key/private keys shown below valid for all jamkazam.com domains
-# note that all recaptcha keys work on localhost/127.0.0.1
-# the keys are created at https://www.google.com/recaptcha/admin/create
-Recaptcha.configure do |config|
-  # created using seth@jamkazam.com; can't see way to delegate
-  config.public_key  = '6Let8dgSAAAAAFheKGWrs6iaq_hIlPOZ2f3Bb56B'
-  config.private_key = '6Let8dgSAAAAAJzFxL9w2QR5auxjk0ol1_xAtOGO'
-
-  if Rails.application.config.recaptcha_enable
-    # mirrors default behavior, but it's nice to see it without digging in recaptcha gem source
-    config.skip_verify_env = ['test', 'cucumber']
-  else
-    # disabled in all environments at the moment
-    config.skip_verify_env = ['test', 'cucumber', 'development', 'production']
-  end
-  # other config options available with this gem:
-  #nonssl_api_server_url,
-  #ssl_api_server_url,
-  #verify_url,
-  #skip_verify_env,
-  #proxy,
-  #handle_timeouts_gracefully
-end
\ No newline at end of file
diff --git a/web/lib/music_session_manager.rb b/web/lib/music_session_manager.rb
index 96a64dd66..a8259c804 100644
--- a/web/lib/music_session_manager.rb
+++ b/web/lib/music_session_manager.rb
@@ -1,9 +1,5 @@
-require 'recaptcha'
-class
-MusicSessionManager < BaseManager
+class MusicSessionManager < BaseManager
 
-  include Recaptcha::Verify
-  
   def initialize(options={})
     super(options)
     @log = Logging.logger[self]
diff --git a/web/lib/user_manager.rb b/web/lib/user_manager.rb
index 7da708c73..a694af94c 100644
--- a/web/lib/user_manager.rb
+++ b/web/lib/user_manager.rb
@@ -1,8 +1,5 @@
-require 'recaptcha'
 class UserManager < BaseManager
 
-  include Recaptcha::Verify
-  
   def initialize(options={})
     super(options)
     @log = Logging.logger[self]
@@ -27,7 +24,7 @@ class UserManager < BaseManager
     fb_signup = options[:fb_signup]
     signup_confirm_url = options[:signup_confirm_url]
     affiliate_referral_id = options[:affiliate_referral_id]
-
+    recaptcha_failed = Rails.application.config.recaptcha_enable && options[:recaptcha_failed]
     user = User.new
 
     # check if we have disabled open signup for this site.   open == invited users can still get in
@@ -46,13 +43,6 @@ class UserManager < BaseManager
       loc[:country] = location[:country]
     end
 
-    # TODO: figure out why can't user verify_recaptcha here
-    # ALSO: make sure we dont do the recaptcha stuff if used facebook.
-
-    # check recaptcha; if any errors seen, contribute it to the model
-    #unless verify_recaptcha(:model => user, :message => "recaptcha")
-    #  return user # user.errors.any? is true now
-    #else
     # sends email to email account for confirmation
     user = User.signup(first_name: first_name,
                         last_name: last_name,
@@ -65,11 +55,13 @@ class UserManager < BaseManager
                         birth_date: birth_date,
                         musician: musician,
                         photo_url: photo_url,
+                        recaptcha_failed: recaptcha_failed,
                         invited_user: invited_user,
                         fb_signup: fb_signup,
                         signup_confirm_url: signup_confirm_url,
                         affiliate_referral_id: affiliate_referral_id)
 
+
     return user
     #end
   end
diff --git a/web/spec/features/signup_spec.rb b/web/spec/features/signup_spec.rb
index 4cb1c74bd..bc37f1567 100644
--- a/web/spec/features/signup_spec.rb
+++ b/web/spec/features/signup_spec.rb
@@ -4,6 +4,15 @@ describe "Signup", :js => true, :type => :feature, :capybara_feature => true do
 
   subject { page }
 
+  before(:all) do
+    @old_recaptcha=Rails.application.config.recaptcha_enable
+    Rails.application.config.recaptcha_enable=false
+  end
+
+  after(:all) do
+    Rails.application.config.recaptcha_enable=@old_recaptcha
+  end
+
   before(:each) do
     @mac_client = FactoryGirl.create(:artifact_update)
     UserMailer.deliveries.clear
diff --git a/web/spec/features/user_progression_spec.rb b/web/spec/features/user_progression_spec.rb
index d3060ac73..2d46a0160 100644
--- a/web/spec/features/user_progression_spec.rb
+++ b/web/spec/features/user_progression_spec.rb
@@ -10,8 +10,15 @@ describe "User Progression", :js => true,  :type => :feature, :capybara_feature
     Capybara.javascript_driver = :poltergeist
     Capybara.current_driver = Capybara.javascript_driver
     Capybara.default_wait_time = 10
+    @old_recaptcha=Rails.application.config.recaptcha_enable
+    Rails.application.config.recaptcha_enable=false
   end
 
+  after(:all) do
+    Rails.application.config.recaptcha_enable=@old_recaptcha
+  end
+
+
   let(:user) { FactoryGirl.create(:user) }
 
   describe "downloaded client" do
diff --git a/web/spec/managers/user_manager_spec.rb b/web/spec/managers/user_manager_spec.rb
index 09d4c1e28..23368a208 100644
--- a/web/spec/managers/user_manager_spec.rb
+++ b/web/spec/managers/user_manager_spec.rb
@@ -633,4 +633,74 @@ describe UserManager do
 
     UserMailer.deliveries.length.should == 0
   end
-end
+
+  describe "without nocaptcha" do
+    before(:all) do
+      @old_recaptcha=Rails.application.config.recaptcha_enable
+      Rails.application.config.recaptcha_enable=false
+    end
+
+    after(:all) do
+      Rails.application.config.recaptcha_enable=@old_recaptcha
+    end
+
+    it "passes even with true recaptcha" do
+      user = @user_manager.signup(remote_ip: "1.2.3.4",
+                                  first_name: "bob",
+                                  last_name: "smith",
+                                  email: "userman30@jamkazam.com",
+                                  password: "foobar",
+                                  password_confirmation: "foobar",
+                                  terms_of_service: true,
+                                  instruments: @instruments,
+                                  musician: true,
+                                  location: @loca,
+                                  recaptcha_failed: true,
+                                  signup_confirm_url: "http://localhost:3000/confirm")
+      user.errors.any?.should be_false      
+    end # it "passes even with true recaptcha"  
+  end # describe "without nocaptcha"
+  
+  describe "with nocaptcha" do
+    before(:all) do
+      @old_recaptcha=Rails.application.config.recaptcha_enable
+      Rails.application.config.recaptcha_enable=true
+    end
+
+    after(:all) do
+      Rails.application.config.recaptcha_enable=@old_recaptcha
+    end
+
+    it "fails when nocaptcha fails" do    
+      user = @user_manager.signup(remote_ip: "1.2.3.4",
+                                  first_name: "bob",
+                                  last_name: "smith",
+                                  email: "userman31@jamkazam.com",
+                                  password: "foobar",
+                                  password_confirmation: "foobar",
+                                  terms_of_service: true,
+                                  instruments: @instruments,
+                                  musician: true,
+                                  location: @loca,
+                                  recaptcha_failed: true,
+                                  signup_confirm_url: "http://localhost:3000/confirm")
+
+      user.errors.any?.should be_true      
+
+      user = @user_manager.signup(remote_ip: "1.2.3.4",
+                                  first_name: "bob",
+                                  last_name: "smith",
+                                  email: "userman31@jamkazam.com",
+                                  password: "foobar",
+                                  password_confirmation: "foobar",
+                                  terms_of_service: true,
+                                  recaptcha_failed: false,
+                                  instruments: @instruments,
+                                  musician: true,
+                                  location: @loca,
+                                  signup_confirm_url: "http://localhost:3000/confirm")
+
+      user.errors.any?.should be_false      
+    end # it "fails when nocaptcha fails"
+  end # describe "with nocaptcha"
+end # test