diff --git a/includes/core/class-form.php b/includes/core/class-form.php
index 111bfdcb..6336ff9a 100644
--- a/includes/core/class-form.php
+++ b/includes/core/class-form.php
@@ -199,7 +199,8 @@ if ( ! class_exists( 'Form' ) ) {
                     } elseif ( isset( $this->post_form['mode'] ) && $this->post_form['mode'] == 'register' ) {
                         $role = $this->assigned_role( $this->form_id );
                         $this->post_form['role'] = $role;
-                        $this->post_form['submitted']['role'] = $role;
+                        //fix for social login
+	                    //$this->post_form['submitted']['role'] = $role;
                     }
 
                     if ( isset( $_POST[ UM()->honeypot ] ) && $_POST[ UM()->honeypot ] != '' ){
diff --git a/includes/core/um-actions-password.php b/includes/core/um-actions-password.php
index afd25200..9f29c8b3 100644
--- a/includes/core/um-actions-password.php
+++ b/includes/core/um-actions-password.php
@@ -66,15 +66,23 @@ if ( ! defined( 'ABSPATH' ) ) exit;
 	add_action( 'send_password_change_email','um_send_password_change_email', 10, 1 );
 	function um_send_password_change_email( $args ) {
 
+		if ( ! is_array( $args ) )
+			return false;
+
+		/**
+		 * @var $user_id
+		 */
 		extract( $args );
 
+		if ( ! isset( $user_id ) )
+			return false;
+
 		um_fetch_user( $user_id );
 
 		UM()->user()->password_changed();
 
 		um_reset_user();
 
-
 		return false;
 	}