diff --git a/inc/class-wp_recaptcha.php b/inc/class-wp_recaptcha.php
index 711ecae..e2d6a0a 100755
--- a/inc/class-wp_recaptcha.php
+++ b/inc/class-wp_recaptcha.php
@@ -67,8 +67,8 @@ private function __construct() {
 
 		if ( $this->has_api_key() ) {
 
-			add_action('init' , array(&$this,'init') , 9 );
-			add_action('plugins_loaded' , array(&$this,'plugins_loaded'), 9 );
+			add_action('init' , array( $this,'init') , 9 );
+			add_action('plugins_loaded' , array( $this,'plugins_loaded'), 9 );
 
 		}
 
@@ -137,47 +137,50 @@ function init() {
 				//*/
 				add_action('pre_comment_on_post',array($this,'recaptcha_check_or_die'));
 
-				add_action( 'print_comments_recaptcha' , array( &$this , 'print_recaptcha_html' ) );
-				add_filter( 'comments_recaptcha_html' , array( &$this , 'recaptcha_html' ) );
+				add_action( 'print_comments_recaptcha' , array( $this , 'print_recaptcha_html' ) );
+				add_filter( 'comments_recaptcha_html' , array( $this , 'recaptcha_html' ) );
 			}
 			if ( $this->get_option('recaptcha_enable_signup') ) {
+				$this->captcha_instance();
 				// buddypress suuport.
 				if ( function_exists('buddypress') ) {
-					add_action('bp_account_details_fields',array($this,'print_recaptcha_html'));
-					add_action('bp_signup_pre_validate',array(&$this,'recaptcha_check_or_die'),99 );
+					add_action('bp_account_details_fields',array( $this,'print_recaptcha_html'));
+					add_action('bp_signup_pre_validate',array( $this,'recaptcha_check_or_die'),99 );
 				} else {
-					add_action('register_form',array($this,'print_recaptcha_html'));
-					add_filter('registration_errors',array(&$this,'registration_errors'));
+					add_action('register_form',array( $this,'print_recaptcha_html'));
+					add_filter('registration_errors',array( $this,'registration_errors'));
 				}
 				if ( is_multisite() ) {
 					add_action( 'signup_extra_fields' , array($this,'print_recaptcha_html'));
-					add_filter('wpmu_validate_user_signup',array(&$this,'wpmu_validate_user_signup'));
+					add_filter('wpmu_validate_user_signup',array( $this,'wpmu_validate_user_signup'));
 				}
-				add_filter( 'signup_recaptcha_html' , array( &$this , 'recaptcha_html' ) );
+				add_filter( 'signup_recaptcha_html' , array(  $this , 'recaptcha_html' ) );
 
 			}
 			if ( $this->get_option('recaptcha_enable_login') ) {
-				add_action('login_form',array(&$this,'print_recaptcha_html'));
-				add_filter('wp_authenticate_user',array(&$this,'deny_login'),99 );
-				add_filter( 'login_recaptcha_html' , array( &$this , 'recaptcha_html' ) );
+				$this->captcha_instance();
+				add_action( 'login_form', array( $this, 'print_recaptcha_html' ) );
+				add_filter( 'wp_authenticate_user', array( $this, 'deny_login'), 99 );
+				add_filter( 'login_recaptcha_html', array( $this , 'recaptcha_html' ) );
 			}
 			if ( $this->get_option('recaptcha_enable_lostpw') ) {
-				add_action('lostpassword_form' , array($this,'print_recaptcha_html') );
+				$this->captcha_instance();
+				add_action('lostpassword_form' , array( $this, 'print_recaptcha_html') );
 //*
-				add_action('lostpassword_post' , array(&$this,'recaptcha_check_or_die') , 99 );
+				add_action('lostpassword_post' , array( $this, 'recaptcha_check_or_die') , 99 );
 /*/ // switch this when pull request accepted and included in official WC release.
-				add_filter('allow_password_reset' , array(&$this,'wp_error') );
+				add_filter('allow_password_reset' , array( $this,'wp_error') );
 //*/
-				add_filter( 'lostpassword_recaptcha_html' , array( &$this , 'recaptcha_html' ) );
+				add_filter( 'lostpassword_recaptcha_html' , array( $this, 'recaptcha_html' ) );
 			}
 			if ( 'WPLANG' === $this->get_option( 'recaptcha_language' ) )
-				add_filter( 'wp_recaptcha_language' , array( &$this,'recaptcha_wplang' ) , 5 );
+				add_filter( 'wp_recaptcha_language' , array( $this, 'recaptcha_wplang' ) , 5 );
 
-			add_action( 'recaptcha_print' , array( &$this , 'print_recaptcha_html' ) );
-			add_filter( 'recaptcha_error' , array( &$this , 'wp_error' ) );
-			add_filter( 'recaptcha_html' , array( &$this , 'recaptcha_html' ) );
+			add_action( 'recaptcha_print' , array( $this, 'print_recaptcha_html' ) );
+			add_filter( 'recaptcha_error' , array( $this, 'wp_error' ) );
+			add_filter( 'recaptcha_html' , array( $this, 'recaptcha_html' ) );
 		}
-		add_filter( 'recaptcha_valid' , array( &$this , 'recaptcha_check' ) );
+		add_filter( 'recaptcha_valid' , array( $this , 'recaptcha_check' ) );
 	}
 
 	/**
diff --git a/inc/class-wp_recaptcha_nocaptcha.php b/inc/class-wp_recaptcha_nocaptcha.php
index f670555..878b6f5 100755
--- a/inc/class-wp_recaptcha_nocaptcha.php
+++ b/inc/class-wp_recaptcha_nocaptcha.php
@@ -106,13 +106,17 @@ private function __clone() {
 	 *	Prevent from creating more than one instance
 	 */
 	private function __construct() {
+
 		if ( did_action( 'wp_enqueue_scripts' ) ) {
 			$this->register_assets();
 		} else {
 			add_action( 'wp_enqueue_scripts', array( $this, 'register_assets') );
+			add_action( 'admin_enqueue_scripts', array( $this, 'register_assets') );
+			add_action( 'login_enqueue_scripts', array( $this, 'register_assets') );
 		}
 	}
 	public function register_assets() {
+		$is_login = current_filter() === 'login_enqueue_scripts';
 
 		$recaptcha_api_url = "https://www.google.com/recaptcha/api.js";
 		$recaptcha_api_url = add_query_arg( array(
@@ -124,11 +128,28 @@ public function register_assets() {
 			$recaptcha_api_url = add_query_arg( 'hl', $language_code, $recaptcha_api_url );
 		}
 		$suffix = WP_DEBUG ? '' : '.min';
-		wp_register_script( 'wp-recaptcha', plugins_url( "js/wp-recaptcha{$suffix}.js" , dirname(__FILE__)) , array( 'jquery' ), false, true );
+		wp_register_script( 'wp-recaptcha', plugins_url( "js/wp-recaptcha{$suffix}.js" , dirname(__FILE__)) , array( 'jquery' ), false, ! $is_login );
 		wp_localize_script( 'wp-recaptcha', 'wp_recaptcha', array(
 			'recaptcha_url'	=> $recaptcha_api_url,
 			'site_key'		=> WP_reCaptcha::instance()->get_option( 'recaptcha_publickey' ),
 		) );
+
+		if ( $is_login ) {
+			wp_enqueue_script( 'wp-recaptcha' );
+			?>
+			<style type="text/css">
+			.wp-recaptcha[data-size="normal"] {
+				width:304px;
+				margin-left:-15px;
+				margin-bottom:15px;
+			}
+			.wp-recaptcha[data-size="compact"] {
+				width:164px;
+				margin-bottom:15px;
+			}
+			</style>
+			<?php
+		}
 	}
 
 	public function get_supported_themes() {
diff --git a/js/wp-recaptcha.js b/js/wp-recaptcha.js
index 23c75f7..89b37ec 100644
--- a/js/wp-recaptcha.js
+++ b/js/wp-recaptcha.js
@@ -1,5 +1,17 @@
 (function($){
-	var $captchas = $('.wp-recaptcha');
+	var $captchas = $('.wp-recaptcha'),
+		$other_captchas = $('.g-recaptcha'),
+		loadedInterval;
+
+	function init() {
+		$other_captchas.removeClass('g-recaptcha');
+		$captchas = $('.wp-recaptcha').addClass('g-recaptcha');
+
+		$('<script></script>')
+			.attr( 'src', wp_recaptcha.recaptcha_url )
+			.appendTo('body');
+	}
+
 	window.wp_recaptcha_loaded = function(){
 		if ( ! grecaptcha ) {
 			return;
@@ -41,15 +53,37 @@
 
 			grecaptcha.render( el, opts );
 		});
+
+		$other_captchas.addClass('g-recaptcha');
 	}
+
+	function captchas_rendered() {
+		var rendered = true;
+		$other_captchas.each( function(i,el) {
+			rendered = captchas_rendered && $(el).html() !== '';
+		});
+		return rendered;
+	}
+
 	// load google recaptcha
 	if ( $captchas.length ) {
-
+		if ( $other_captchas.length || $('.nf-form-cont').length ) {
+			if ( 'undefined' !== typeof grecaptcha ) {
+				wp_recaptcha_loaded();
+			} else {
+				loadedInterval = setInterval(function(){
+					if ( 'undefined' !== typeof grecaptcha ) {
+						clearInterval( loadedInterval );
+						wp_recaptcha_loaded();
+					}
+				},333);
+			}
+		} else {
+			init();
+		}
 		// load recaptcha script
-		$('<script></script>')
-			.attr( 'src', wp_recaptcha.recaptcha_url )
-			.appendTo('body');
+	} else {
+		$(document).ready( init );
 	}
 
-
 })(jQuery);
diff --git a/js/wp-recaptcha.min.js b/js/wp-recaptcha.min.js
index 227dff9..9b161b8 100644
--- a/js/wp-recaptcha.min.js
+++ b/js/wp-recaptcha.min.js
@@ -1,2 +1,2 @@
-!function(t){var e=t(".wp-recaptcha");window.wp_recaptcha_loaded=function(){grecaptcha&&e.each(function(e,a){var i,p=t(a).closest("form"),c={sitekey:wp_recaptcha.site_key,theme:t(a).attr("data-theme"),size:t(a).attr("data-size")},r=t(a).attr("data-callback");""!==r&&(c.callback=function(){p.find('[type="submit"]').prop("disabled",!1)},c.expiredCallback=function(){p.find('[type="submit"]').prop("disabled",!0)},p.find('[type="submit"]').prop("disabled",!0).length||p.append('<input type="submit" style="visibilit:hidden;width:1px;height;1px;" />'),"submit"==r&&p.find('[type="submit"]').length&&(i=setInterval(function(){p.find('[type="submit"]').prop("disabled")||(clearInterval(i),p.find('[type="submit"]').trigger("click"))},100))),grecaptcha.render(a,c)})},e.length&&t("<script><\/script>").attr("src",wp_recaptcha.recaptcha_url).appendTo("body")}(jQuery);
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndwLXJlY2FwdGNoYS5qcyJdLCJuYW1lcyI6WyIkIiwiJGNhcHRjaGFzIiwid2luZG93Iiwid3BfcmVjYXB0Y2hhX2xvYWRlZCIsImdyZWNhcHRjaGEiLCJlYWNoIiwiaSIsImVsIiwic3VibWl0SW50ZXJ2YWwiLCIkZm9ybSIsImNsb3Nlc3QiLCJvcHRzIiwic2l0ZWtleSIsIndwX3JlY2FwdGNoYSIsInNpdGVfa2V5IiwidGhlbWUiLCJhdHRyIiwic2l6ZSIsImNiIiwiY2FsbGJhY2siLCJmaW5kIiwicHJvcCIsImV4cGlyZWRDYWxsYmFjayIsImxlbmd0aCIsImFwcGVuZCIsInNldEludGVydmFsIiwiY2xlYXJJbnRlcnZhbCIsInRyaWdnZXIiLCJyZW5kZXIiLCJyZWNhcHRjaGFfdXJsIiwiYXBwZW5kVG8iLCJqUXVlcnkiXSwibWFwcGluZ3MiOiJDQUFBLFNBQVVBLEdBQ1QsR0FBSUMsR0FBWUQsRUFBRSxnQkFDbEJFLFFBQU9DLG9CQUFzQixXQUNyQkMsWUFJUEgsRUFBVUksS0FBSyxTQUFTQyxFQUFFQyxHQUN6QixHQU9DQyxHQVBHQyxFQUFRVCxFQUFFTyxHQUFJRyxRQUFRLFFBQ3RCQyxHQUNGQyxRQUFXQyxhQUFhQyxTQUN4QkMsTUFBU2YsRUFBRU8sR0FBSVMsS0FBSyxjQUNwQkMsS0FBUWpCLEVBQUVPLEdBQUlTLEtBQUssY0FFcEJFLEVBQUtsQixFQUFFTyxHQUFJUyxLQUFLLGdCQUdKLE1BQVBFLElBRUpQLEVBQUtRLFNBQVcsV0FDZlYsRUFBTVcsS0FBSyxtQkFBbUJDLEtBQU0sWUFBWSxJQUVqRFYsRUFBS1csZ0JBQWtCLFdBQ3RCYixFQUFNVyxLQUFLLG1CQUFtQkMsS0FBTSxZQUFZLElBRzFDWixFQUFNVyxLQUFLLG1CQUFtQkMsS0FBTSxZQUFZLEdBQU9FLFFBQzdEZCxFQUFNZSxPQUFPLDBFQUdILFVBQU5OLEdBQWtCVCxFQUFNVyxLQUFLLG1CQUFtQkcsU0FDcERmLEVBQWlCaUIsWUFBWSxXQUNyQmhCLEVBQU1XLEtBQUssbUJBQW1CQyxLQUFNLGNBQzFDSyxjQUFjbEIsR0FFZEMsRUFBTVcsS0FBSyxtQkFBbUJPLFFBQVEsV0FFckMsT0FJTnZCLFdBQVd3QixPQUFRckIsRUFBSUksTUFJcEJWLEVBQVVzQixRQUdkdkIsRUFBRSxzQkFDQWdCLEtBQU0sTUFBT0gsYUFBYWdCLGVBQzFCQyxTQUFTLFNBSVZDIiwiZmlsZSI6IndwLXJlY2FwdGNoYS5taW4uanMiLCJzb3VyY2VzQ29udGVudCI6WyIoZnVuY3Rpb24oJCl7XG5cdHZhciAkY2FwdGNoYXMgPSAkKCcud3AtcmVjYXB0Y2hhJyk7XG5cdHdpbmRvdy53cF9yZWNhcHRjaGFfbG9hZGVkID0gZnVuY3Rpb24oKXtcblx0XHRpZiAoICEgZ3JlY2FwdGNoYSApIHtcblx0XHRcdHJldHVybjtcblx0XHR9XG5cblx0XHQkY2FwdGNoYXMuZWFjaChmdW5jdGlvbihpLGVsKXtcblx0XHRcdHZhciAkZm9ybSA9ICQoZWwpLmNsb3Nlc3QoJ2Zvcm0nKTtcblx0XHRcdHZhciBvcHRzID0ge1xuXHRcdFx0XHRcdHNpdGVrZXlcdFx0OiB3cF9yZWNhcHRjaGEuc2l0ZV9rZXksXG5cdFx0XHRcdFx0dGhlbWVcdFx0OiAkKGVsKS5hdHRyKCdkYXRhLXRoZW1lJyksXG5cdFx0XHRcdFx0c2l6ZVx0XHQ6ICQoZWwpLmF0dHIoJ2RhdGEtc2l6ZScpLFxuXHRcdFx0XHR9LFxuXHRcdFx0XHRjYiA9ICQoZWwpLmF0dHIoJ2RhdGEtY2FsbGJhY2snKSxcblx0XHRcdFx0c3VibWl0SW50ZXJ2YWw7XG5cblx0XHRcdFx0aWYgKCBjYiAhPT0gJycgKSB7XG5cblx0XHRcdFx0XHRvcHRzLmNhbGxiYWNrID0gZnVuY3Rpb24oKSB7XG5cdFx0XHRcdFx0XHQkZm9ybS5maW5kKCdbdHlwZT1cInN1Ym1pdFwiXScpLnByb3AoICdkaXNhYmxlZCcsIGZhbHNlICk7XG5cdFx0XHRcdFx0fTtcblx0XHRcdFx0XHRvcHRzLmV4cGlyZWRDYWxsYmFjayA9IGZ1bmN0aW9uKCkge1xuXHRcdFx0XHRcdFx0JGZvcm0uZmluZCgnW3R5cGU9XCJzdWJtaXRcIl0nKS5wcm9wKCAnZGlzYWJsZWQnLCB0cnVlICk7XG5cdFx0XHRcdFx0fVxuXG5cdFx0XHRcdFx0aWYgKCAhICRmb3JtLmZpbmQoJ1t0eXBlPVwic3VibWl0XCJdJykucHJvcCggJ2Rpc2FibGVkJywgdHJ1ZSApLmxlbmd0aCApIHtcblx0XHRcdFx0XHRcdCRmb3JtLmFwcGVuZCgnPGlucHV0IHR5cGU9XCJzdWJtaXRcIiBzdHlsZT1cInZpc2liaWxpdDpoaWRkZW47d2lkdGg6MXB4O2hlaWdodDsxcHg7XCIgLz4nKVxuXHRcdFx0XHRcdH1cblxuXHRcdFx0XHRcdGlmICggY2IgPT0gJ3N1Ym1pdCcgJiYgJGZvcm0uZmluZCgnW3R5cGU9XCJzdWJtaXRcIl0nKS5sZW5ndGggKSB7XG5cdFx0XHRcdFx0XHRzdWJtaXRJbnRlcnZhbCA9IHNldEludGVydmFsKGZ1bmN0aW9uKCl7XG5cdFx0XHRcdFx0XHRcdGlmICggISAkZm9ybS5maW5kKCdbdHlwZT1cInN1Ym1pdFwiXScpLnByb3AoICdkaXNhYmxlZCcgKSApIHtcblx0XHRcdFx0XHRcdFx0XHRjbGVhckludGVydmFsKHN1Ym1pdEludGVydmFsKTtcblx0XHRcdFx0XHRcdFx0XHQvLyBmb3JtLnN1Ym1pdCgpIGRvZXMgbm90IHdvcmtcblx0XHRcdFx0XHRcdFx0XHQkZm9ybS5maW5kKCdbdHlwZT1cInN1Ym1pdFwiXScpLnRyaWdnZXIoJ2NsaWNrJyk7XG5cdFx0XHRcdFx0XHRcdH1cblx0XHRcdFx0XHRcdH0sIDEwMCApO1xuXHRcdFx0XHRcdH1cblx0XHRcdFx0fVxuXG5cdFx0XHRncmVjYXB0Y2hhLnJlbmRlciggZWwsIG9wdHMgKTtcblx0XHR9KTtcblx0fVxuXHQvLyBsb2FkIGdvb2dsZSByZWNhcHRjaGFcblx0aWYgKCAkY2FwdGNoYXMubGVuZ3RoICkge1xuXG5cdFx0Ly8gbG9hZCByZWNhcHRjaGEgc2NyaXB0XG5cdFx0JCgnPHNjcmlwdD48L3NjcmlwdD4nKVxuXHRcdFx0LmF0dHIoICdzcmMnLCB3cF9yZWNhcHRjaGEucmVjYXB0Y2hhX3VybCApXG5cdFx0XHQuYXBwZW5kVG8oJ2JvZHknKTtcblx0fVxuXG5cbn0pKGpRdWVyeSk7XG4iXX0=
+!function(t){function e(){p.removeClass("g-recaptcha"),c=t(".wp-recaptcha").addClass("g-recaptcha"),t("<script><\/script>").attr("src",wp_recaptcha.recaptcha_url).appendTo("body")}var a,c=t(".wp-recaptcha"),p=t(".g-recaptcha");window.wp_recaptcha_loaded=function(){grecaptcha&&(c.each(function(e,a){var c,p=t(a).closest("form"),i={sitekey:wp_recaptcha.site_key,theme:t(a).attr("data-theme"),size:t(a).attr("data-size")},r=t(a).attr("data-callback");""!==r&&(i.callback=function(){p.find('[type="submit"]').prop("disabled",!1)},i.expiredCallback=function(){p.find('[type="submit"]').prop("disabled",!0)},p.find('[type="submit"]').prop("disabled",!0).length||p.append('<input type="submit" style="visibilit:hidden;width:1px;height;1px;" />'),"submit"==r&&p.find('[type="submit"]').length&&(c=setInterval(function(){p.find('[type="submit"]').prop("disabled")||(clearInterval(c),p.find('[type="submit"]').trigger("click"))},100))),grecaptcha.render(a,i)}),p.addClass("g-recaptcha"))},c.length?p.length||t(".nf-form-cont").length?"undefined"!=typeof grecaptcha?wp_recaptcha_loaded():a=setInterval(function(){"undefined"!=typeof grecaptcha&&(clearInterval(a),wp_recaptcha_loaded())},333):e():t(document).ready(e)}(jQuery);
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndwLXJlY2FwdGNoYS5qcyJdLCJuYW1lcyI6WyIkIiwiaW5pdCIsIiRvdGhlcl9jYXB0Y2hhcyIsInJlbW92ZUNsYXNzIiwiJGNhcHRjaGFzIiwiYWRkQ2xhc3MiLCJhdHRyIiwid3BfcmVjYXB0Y2hhIiwicmVjYXB0Y2hhX3VybCIsImFwcGVuZFRvIiwibG9hZGVkSW50ZXJ2YWwiLCJ3aW5kb3ciLCJ3cF9yZWNhcHRjaGFfbG9hZGVkIiwiZ3JlY2FwdGNoYSIsImVhY2giLCJpIiwiZWwiLCJzdWJtaXRJbnRlcnZhbCIsIiRmb3JtIiwiY2xvc2VzdCIsIm9wdHMiLCJzaXRla2V5Iiwic2l0ZV9rZXkiLCJ0aGVtZSIsInNpemUiLCJjYiIsImNhbGxiYWNrIiwiZmluZCIsInByb3AiLCJleHBpcmVkQ2FsbGJhY2siLCJsZW5ndGgiLCJhcHBlbmQiLCJzZXRJbnRlcnZhbCIsImNsZWFySW50ZXJ2YWwiLCJ0cmlnZ2VyIiwicmVuZGVyIiwiZG9jdW1lbnQiLCJyZWFkeSIsImpRdWVyeSJdLCJtYXBwaW5ncyI6IkNBQUEsU0FBVUEsR0FLVCxRQUFTQyxLQUNSQyxFQUFnQkMsWUFBWSxlQUM1QkMsRUFBWUosRUFBRSxpQkFBaUJLLFNBQVMsZUFFeENMLEVBQUUsc0JBQ0FNLEtBQU0sTUFBT0MsYUFBYUMsZUFDMUJDLFNBQVMsUUFWWixHQUVDQyxHQUZHTixFQUFZSixFQUFFLGlCQUNqQkUsRUFBa0JGLEVBQUUsZUFZckJXLFFBQU9DLG9CQUFzQixXQUNyQkMsYUFJUFQsRUFBVVUsS0FBSyxTQUFTQyxFQUFFQyxHQUN6QixHQU9DQyxHQVBHQyxFQUFRbEIsRUFBRWdCLEdBQUlHLFFBQVEsUUFDdEJDLEdBQ0ZDLFFBQVdkLGFBQWFlLFNBQ3hCQyxNQUFTdkIsRUFBRWdCLEdBQUlWLEtBQUssY0FDcEJrQixLQUFReEIsRUFBRWdCLEdBQUlWLEtBQUssY0FFcEJtQixFQUFLekIsRUFBRWdCLEdBQUlWLEtBQUssZ0JBR0osTUFBUG1CLElBRUpMLEVBQUtNLFNBQVcsV0FDZlIsRUFBTVMsS0FBSyxtQkFBbUJDLEtBQU0sWUFBWSxJQUVqRFIsRUFBS1MsZ0JBQWtCLFdBQ3RCWCxFQUFNUyxLQUFLLG1CQUFtQkMsS0FBTSxZQUFZLElBRzFDVixFQUFNUyxLQUFLLG1CQUFtQkMsS0FBTSxZQUFZLEdBQU9FLFFBQzdEWixFQUFNYSxPQUFPLDBFQUdILFVBQU5OLEdBQWtCUCxFQUFNUyxLQUFLLG1CQUFtQkcsU0FDcERiLEVBQWlCZSxZQUFZLFdBQ3JCZCxFQUFNUyxLQUFLLG1CQUFtQkMsS0FBTSxjQUMxQ0ssY0FBY2hCLEdBRWRDLEVBQU1TLEtBQUssbUJBQW1CTyxRQUFRLFdBRXJDLE9BSU5yQixXQUFXc0IsT0FBUW5CLEVBQUlJLEtBR3hCbEIsRUFBZ0JHLFNBQVMsaUJBWXJCRCxFQUFVMEIsT0FDVDVCLEVBQWdCNEIsUUFBVTlCLEVBQUUsaUJBQWlCOEIsT0FDNUMsbUJBQXVCakIsWUFDM0JELHNCQUVBRixFQUFpQnNCLFlBQVksV0FDdkIsbUJBQXVCbkIsY0FDM0JvQixjQUFldkIsR0FDZkUsd0JBRUEsS0FHSFgsSUFJREQsRUFBRW9DLFVBQVVDLE1BQU9wQyxJQUdsQnFDIiwiZmlsZSI6IndwLXJlY2FwdGNoYS5taW4uanMiLCJzb3VyY2VzQ29udGVudCI6WyIoZnVuY3Rpb24oJCl7XG5cdHZhciAkY2FwdGNoYXMgPSAkKCcud3AtcmVjYXB0Y2hhJyksXG5cdFx0JG90aGVyX2NhcHRjaGFzID0gJCgnLmctcmVjYXB0Y2hhJyksXG5cdFx0bG9hZGVkSW50ZXJ2YWw7XG5cblx0ZnVuY3Rpb24gaW5pdCgpIHtcblx0XHQkb3RoZXJfY2FwdGNoYXMucmVtb3ZlQ2xhc3MoJ2ctcmVjYXB0Y2hhJyk7XG5cdFx0JGNhcHRjaGFzID0gJCgnLndwLXJlY2FwdGNoYScpLmFkZENsYXNzKCdnLXJlY2FwdGNoYScpO1xuXG5cdFx0JCgnPHNjcmlwdD48L3NjcmlwdD4nKVxuXHRcdFx0LmF0dHIoICdzcmMnLCB3cF9yZWNhcHRjaGEucmVjYXB0Y2hhX3VybCApXG5cdFx0XHQuYXBwZW5kVG8oJ2JvZHknKTtcblx0fVxuXG5cdHdpbmRvdy53cF9yZWNhcHRjaGFfbG9hZGVkID0gZnVuY3Rpb24oKXtcblx0XHRpZiAoICEgZ3JlY2FwdGNoYSApIHtcblx0XHRcdHJldHVybjtcblx0XHR9XG5cblx0XHQkY2FwdGNoYXMuZWFjaChmdW5jdGlvbihpLGVsKXtcblx0XHRcdHZhciAkZm9ybSA9ICQoZWwpLmNsb3Nlc3QoJ2Zvcm0nKTtcblx0XHRcdHZhciBvcHRzID0ge1xuXHRcdFx0XHRcdHNpdGVrZXlcdFx0OiB3cF9yZWNhcHRjaGEuc2l0ZV9rZXksXG5cdFx0XHRcdFx0dGhlbWVcdFx0OiAkKGVsKS5hdHRyKCdkYXRhLXRoZW1lJyksXG5cdFx0XHRcdFx0c2l6ZVx0XHQ6ICQoZWwpLmF0dHIoJ2RhdGEtc2l6ZScpLFxuXHRcdFx0XHR9LFxuXHRcdFx0XHRjYiA9ICQoZWwpLmF0dHIoJ2RhdGEtY2FsbGJhY2snKSxcblx0XHRcdFx0c3VibWl0SW50ZXJ2YWw7XG5cblx0XHRcdFx0aWYgKCBjYiAhPT0gJycgKSB7XG5cblx0XHRcdFx0XHRvcHRzLmNhbGxiYWNrID0gZnVuY3Rpb24oKSB7XG5cdFx0XHRcdFx0XHQkZm9ybS5maW5kKCdbdHlwZT1cInN1Ym1pdFwiXScpLnByb3AoICdkaXNhYmxlZCcsIGZhbHNlICk7XG5cdFx0XHRcdFx0fTtcblx0XHRcdFx0XHRvcHRzLmV4cGlyZWRDYWxsYmFjayA9IGZ1bmN0aW9uKCkge1xuXHRcdFx0XHRcdFx0JGZvcm0uZmluZCgnW3R5cGU9XCJzdWJtaXRcIl0nKS5wcm9wKCAnZGlzYWJsZWQnLCB0cnVlICk7XG5cdFx0XHRcdFx0fVxuXG5cdFx0XHRcdFx0aWYgKCAhICRmb3JtLmZpbmQoJ1t0eXBlPVwic3VibWl0XCJdJykucHJvcCggJ2Rpc2FibGVkJywgdHJ1ZSApLmxlbmd0aCApIHtcblx0XHRcdFx0XHRcdCRmb3JtLmFwcGVuZCgnPGlucHV0IHR5cGU9XCJzdWJtaXRcIiBzdHlsZT1cInZpc2liaWxpdDpoaWRkZW47d2lkdGg6MXB4O2hlaWdodDsxcHg7XCIgLz4nKVxuXHRcdFx0XHRcdH1cblxuXHRcdFx0XHRcdGlmICggY2IgPT0gJ3N1Ym1pdCcgJiYgJGZvcm0uZmluZCgnW3R5cGU9XCJzdWJtaXRcIl0nKS5sZW5ndGggKSB7XG5cdFx0XHRcdFx0XHRzdWJtaXRJbnRlcnZhbCA9IHNldEludGVydmFsKGZ1bmN0aW9uKCl7XG5cdFx0XHRcdFx0XHRcdGlmICggISAkZm9ybS5maW5kKCdbdHlwZT1cInN1Ym1pdFwiXScpLnByb3AoICdkaXNhYmxlZCcgKSApIHtcblx0XHRcdFx0XHRcdFx0XHRjbGVhckludGVydmFsKHN1Ym1pdEludGVydmFsKTtcblx0XHRcdFx0XHRcdFx0XHQvLyBmb3JtLnN1Ym1pdCgpIGRvZXMgbm90IHdvcmtcblx0XHRcdFx0XHRcdFx0XHQkZm9ybS5maW5kKCdbdHlwZT1cInN1Ym1pdFwiXScpLnRyaWdnZXIoJ2NsaWNrJyk7XG5cdFx0XHRcdFx0XHRcdH1cblx0XHRcdFx0XHRcdH0sIDEwMCApO1xuXHRcdFx0XHRcdH1cblx0XHRcdFx0fVxuXG5cdFx0XHRncmVjYXB0Y2hhLnJlbmRlciggZWwsIG9wdHMgKTtcblx0XHR9KTtcblxuXHRcdCRvdGhlcl9jYXB0Y2hhcy5hZGRDbGFzcygnZy1yZWNhcHRjaGEnKTtcblx0fVxuXG5cdGZ1bmN0aW9uIGNhcHRjaGFzX3JlbmRlcmVkKCkge1xuXHRcdHZhciByZW5kZXJlZCA9IHRydWU7XG5cdFx0JG90aGVyX2NhcHRjaGFzLmVhY2goIGZ1bmN0aW9uKGksZWwpIHtcblx0XHRcdHJlbmRlcmVkID0gY2FwdGNoYXNfcmVuZGVyZWQgJiYgJChlbCkuaHRtbCgpICE9PSAnJztcblx0XHR9KTtcblx0XHRyZXR1cm4gcmVuZGVyZWQ7XG5cdH1cblxuXHQvLyBsb2FkIGdvb2dsZSByZWNhcHRjaGFcblx0aWYgKCAkY2FwdGNoYXMubGVuZ3RoICkge1xuXHRcdGlmICggJG90aGVyX2NhcHRjaGFzLmxlbmd0aCB8fCAkKCcubmYtZm9ybS1jb250JykubGVuZ3RoICkge1xuXHRcdFx0aWYgKCAndW5kZWZpbmVkJyAhPT0gdHlwZW9mIGdyZWNhcHRjaGEgKSB7XG5cdFx0XHRcdHdwX3JlY2FwdGNoYV9sb2FkZWQoKTtcblx0XHRcdH0gZWxzZSB7XG5cdFx0XHRcdGxvYWRlZEludGVydmFsID0gc2V0SW50ZXJ2YWwoZnVuY3Rpb24oKXtcblx0XHRcdFx0XHRpZiAoICd1bmRlZmluZWQnICE9PSB0eXBlb2YgZ3JlY2FwdGNoYSApIHtcblx0XHRcdFx0XHRcdGNsZWFySW50ZXJ2YWwoIGxvYWRlZEludGVydmFsICk7XG5cdFx0XHRcdFx0XHR3cF9yZWNhcHRjaGFfbG9hZGVkKCk7XG5cdFx0XHRcdFx0fVxuXHRcdFx0XHR9LDMzMyk7XG5cdFx0XHR9XG5cdFx0fSBlbHNlIHtcblx0XHRcdGluaXQoKTtcblx0XHR9XG5cdFx0Ly8gbG9hZCByZWNhcHRjaGEgc2NyaXB0XG5cdH0gZWxzZSB7XG5cdFx0JChkb2N1bWVudCkucmVhZHkoIGluaXQgKTtcblx0fVxuXG59KShqUXVlcnkpO1xuIl19
diff --git a/readme.txt b/readme.txt
index 68a632b..7df5679 100644
--- a/readme.txt
+++ b/readme.txt
@@ -49,13 +49,6 @@ running under his/her own domain name.
 
 
 = Known Limitations =
-- A No Captcha definitely requires client side JavaScript enabled. That's how it does its
-  sophisticated bot detection magic. There is no fallback. If your visitor does not have
-  JS enabled the captcha test will not let him through.
-
-- As of version 4.3 CF7 comes with its own recaptcha. Both are supposed to work together.
-  I you want to keep the WP ReCaptcha functionality, e.g. if you want to hide the captcha
-  from known users, leave the integration in the CF7 settings unconfigured.
 
 - In **WooCommerce** the reset password form can not be protected by a captcha. Woocommerce does
   not fire any action in the lost password form, so there is no way for the plugin to hook in.
diff --git a/src/js/wp-recaptcha.js b/src/js/wp-recaptcha.js
index 23c75f7..89b37ec 100644
--- a/src/js/wp-recaptcha.js
+++ b/src/js/wp-recaptcha.js
@@ -1,5 +1,17 @@
 (function($){
-	var $captchas = $('.wp-recaptcha');
+	var $captchas = $('.wp-recaptcha'),
+		$other_captchas = $('.g-recaptcha'),
+		loadedInterval;
+
+	function init() {
+		$other_captchas.removeClass('g-recaptcha');
+		$captchas = $('.wp-recaptcha').addClass('g-recaptcha');
+
+		$('<script></script>')
+			.attr( 'src', wp_recaptcha.recaptcha_url )
+			.appendTo('body');
+	}
+
 	window.wp_recaptcha_loaded = function(){
 		if ( ! grecaptcha ) {
 			return;
@@ -41,15 +53,37 @@
 
 			grecaptcha.render( el, opts );
 		});
+
+		$other_captchas.addClass('g-recaptcha');
 	}
+
+	function captchas_rendered() {
+		var rendered = true;
+		$other_captchas.each( function(i,el) {
+			rendered = captchas_rendered && $(el).html() !== '';
+		});
+		return rendered;
+	}
+
 	// load google recaptcha
 	if ( $captchas.length ) {
-
+		if ( $other_captchas.length || $('.nf-form-cont').length ) {
+			if ( 'undefined' !== typeof grecaptcha ) {
+				wp_recaptcha_loaded();
+			} else {
+				loadedInterval = setInterval(function(){
+					if ( 'undefined' !== typeof grecaptcha ) {
+						clearInterval( loadedInterval );
+						wp_recaptcha_loaded();
+					}
+				},333);
+			}
+		} else {
+			init();
+		}
 		// load recaptcha script
-		$('<script></script>')
-			.attr( 'src', wp_recaptcha.recaptcha_url )
-			.appendTo('body');
+	} else {
+		$(document).ready( init );
 	}
 
-
 })(jQuery);