diff --git a/wp-content/plugins/wp-recaptcha-bp/recaptcha.php b/wp-content/plugins/wp-recaptcha-bp/recaptcha.php
index 73461902f..0ba2fab2d 100644
--- a/wp-content/plugins/wp-recaptcha-bp/recaptcha.php
+++ b/wp-content/plugins/wp-recaptcha-bp/recaptcha.php
@@ -110,13 +110,19 @@ class ReCAPTCHAPlugin extends WPPlugin
 
     // set the default options
     function register_default_options() {
-        if ($this->options)
+        if ($this->options) {
+            if ($this->keys_missing()) {
+                $this->options['site_key'] = GLOBAL_RECAPTCHA_KEY;
+                $this->options['secret'] = GLOBAL_RECAPTCHA_PRIVATE_KEY;
+                WPPlugin::add_options($this->options_name, $this->options);
+            }
             return;
+        }
         $option_defaults = array();
         $old_options = WPPlugin::retrieve_options("recaptcha");
         if ($old_options) {
-           $option_defaults['site_key'] = $old_options['pubkey'];
-           $option_defaults['secret'] = $old_options['privkey'];
+           $option_defaults['site_key'] = $old_options['pubkey'] ? $old_options['pubkey'] : GLOBAL_RECAPTCHA_KEY;
+           $option_defaults['secret'] = $old_options['privkey'] ? $old_options['privkey'] : GLOBAL_RECAPTCHA_PRIVATE_KEY;
 
            // styling
            $option_defaults['recaptcha_language'] = $old_options['re_lang'];
@@ -126,14 +132,14 @@ class ReCAPTCHAPlugin extends WPPlugin
         } else {
            $old_options = WPPlugin::retrieve_options($this->options_name);
            if ($old_options) {
-               $option_defaults['site_key'] = $old_options['public_key'];
-               $option_defaults['secret'] = $old_options['private_key'];
+               $option_defaults['site_key'] = $old_options['public_key'] ? $old_options['pubkey'] : GLOBAL_RECAPTCHA_KEY;
+               $option_defaults['secret'] = $old_options['private_key'] ? $old_options['privkey'] : GLOBAL_RECAPTCHA_PRIVATE_KEY;
                $option_defaults['comments_theme'] = 'standard';
                $option_defaults['recaptcha_language'] = $old_options['recaptcha_language'];
                $option_defaults['no_response_error'] = $old_options['no_response_error'];
-           } else {           
-               $option_defaults['site_key'] = '';
-               $option_defaults['secret'] = '';
+           } else {
+               $option_defaults['site_key'] = GLOBAL_RECAPTCHA_KEY;
+               $option_defaults['secret'] = GLOBAL_RECAPTCHA_PRIVATE_KEY;
                $option_defaults['comments_theme'] = 'standard';
                $option_defaults['recaptcha_language'] = 'en';
                $option_defaults['no_response_error'] =
@@ -171,9 +177,11 @@ class ReCAPTCHAPlugin extends WPPlugin
     }
 
     function missing_keys_notice() {
+        /*
         if ($this->keys_missing()) {
             $this->create_error_notice('reCAPTCHA API Keys are missing.');
         }
+        */
     }
 
     function validate_dropdown($array, $key, $value) {
@@ -202,7 +210,9 @@ class ReCAPTCHAPlugin extends WPPlugin
 
         // if it's for wordpress mu, show the errors
         if ($this->is_multi_blog()) {
-            $error = $errors->get_error_message('captcha');
+            if( is_wp_error( $errors ) ) {
+              $error = $errors->get_error_message('captcha');
+            }
             echo '<label for="verification">Verification:</label>';
             echo ($error ? '<p class="error">' . $error . '</p>' : '');
             echo $this->get_recaptcha_html();
@@ -243,7 +253,7 @@ class ReCAPTCHAPlugin extends WPPlugin
                 $_POST['g-recaptcha-response'] == '') {
                 $result['errors']->add('blank_captcha',
                     $this->options['no_response_error']);
-                return $result['errors'];
+                return $result;
             }
 
             if ($this->_reCaptchaLib == null) {
diff --git a/wp-content/plugins/wp-recaptcha-bp/wp-plugin.php b/wp-content/plugins/wp-recaptcha-bp/wp-plugin.php
index ef05111ee..001c89597 100644
--- a/wp-content/plugins/wp-recaptcha-bp/wp-plugin.php
+++ b/wp-content/plugins/wp-recaptcha-bp/wp-plugin.php
@@ -59,9 +59,13 @@ if (!class_exists('WPPlugin')) {
 
         static function plugins_url() {
            if (WPPlugin::determine_environment() == Environment::WordPressMU)
-               return site_url() . '/wp-content/mu-plugins';
+               $url = site_url() . '/wp-content/mu-plugins';
            else
-               return site_url() . '/wp-content/plugins';
+               $url =  site_url() . '/wp-content/plugins';
+           if ($_SERVER['https'] == 'on') {
+               $url = str_replace('http://', 'https://', $url);
+           }
+           return $url;
         }
 
         static function path_to_plugin_directory() {