diff --git a/core/um-actions-form.php b/core/um-actions-form.php
index 8e49c9ed..0418b5bb 100644
--- a/core/um-actions-form.php
+++ b/core/um-actions-form.php
@@ -385,6 +385,10 @@
 
 								if ( in_array( $key, array('user_email') ) ) {
 
+									if( ! isset( $args['user_id'] ) ){
+										$args['user_id'] = um_get_requested_user();
+									}
+
 									if ( $args[$key] == '' && in_array( $key, array('user_email') ) ) {
 										$ultimatemember->form->add_error($key, __('You must provide your email','ultimatemember') );
 									} else if ( in_array( $mode, array('register') )  && email_exists( $args[$key] )  ) {
diff --git a/core/um-fields.php b/core/um-fields.php
index 51caf272..6f483c8d 100644
--- a/core/um-fields.php
+++ b/core/um-fields.php
@@ -929,7 +929,9 @@ class UM_Fields {
 		// get whole field data
 		if ( isset( $data ) && is_array( $data ) ) {
 			$data = $this->get_field($key);
-			extract($data);
+			if( is_array( $data ) ){
+				extract($data);
+			}
 		}
 
 		if ( !isset( $data['type'] ) ) return;
@@ -1083,7 +1085,17 @@ class UM_Fields {
 
 						}
 
-						$output .= '<input '.$disabled.' class="'.$this->get_class($key, $data).'" type="number" name="'.$key.$ultimatemember->form->form_suffix.'" id="'.$key.$ultimatemember->form->form_suffix.'" value="'. htmlspecialchars( $this->field_value( $key, $default, $data ) ) .'" placeholder="'.$placeholder.'" data-validate="'.$validate.'" data-key="'.$key.'" min="' . $min . '" max="' . $max . '" />
+						$number_limit = '';
+
+						if( isset( $min ) ){
+							$number_limit .= " min=\"{$min}\" ";
+						}
+
+						if( isset( $max ) ){
+							$number_limit .= " max=\"{$max}\" ";
+						}
+
+						$output .= '<input '.$disabled.' class="'.$this->get_class($key, $data).'" type="number" name="'.$key.$ultimatemember->form->form_suffix.'" id="'.$key.$ultimatemember->form->form_suffix.'" value="'. htmlspecialchars( $this->field_value( $key, $default, $data ) ) .'" placeholder="'.$placeholder.'" data-validate="'.$validate.'" data-key="'.$key.'" {$number_limit} />
 
 						</div>';