diff --git a/includes/class-init.php b/includes/class-init.php
index d37afa25..d5021351 100644
--- a/includes/class-init.php
+++ b/includes/class-init.php
@@ -926,28 +926,28 @@ if ( ! class_exists( 'UM' ) ) {
 		/**
 		 * @since 2.0
 		 *
-		 * @param $data array
+		 * @param bool|array $data
 		 * @return um\admin\core\Admin_Forms()
 		 */
 		function admin_forms( $data = false ) {
-			if ( ! isset(  $this->classes['admin_forms_' . $data['class']]  ) && empty( $this->classes['admin_forms_' . $data['class']] ) ) {
-				$this->classes['admin_forms_' . $data['class']] = new um\admin\core\Admin_Forms( $data );
+			if ( ! isset( $this->classes[ 'admin_forms_' . $data['class'] ] ) || empty( $this->classes[ 'admin_forms_' . $data['class'] ] ) ) {
+				$this->classes[ 'admin_forms_' . $data['class'] ] = new um\admin\core\Admin_Forms( $data );
 			}
-			return $this->classes['admin_forms_' . $data['class']];
+			return $this->classes[ 'admin_forms_' . $data['class'] ];
 		}
 
 
 		/**
 		 * @since 2.0
 		 *
-		 * @param $data array
+		 * @param bool|array $data
 		 * @return um\admin\core\Admin_Forms_Settings()
 		 */
 		function admin_forms_settings( $data = false ) {
-			if ( empty( $this->classes['admin_forms_settings_' . $data['class']] ) ) {
-				$this->classes['admin_forms_settings_' . $data['class']] = new um\admin\core\Admin_Forms_Settings( $data );
+			if ( ! isset( $this->classes[ 'admin_forms_settings_' . $data['class'] ] ) || empty( $this->classes[ 'admin_forms_settings_' . $data['class'] ] ) ) {
+				$this->classes[ 'admin_forms_settings_' . $data['class'] ] = new um\admin\core\Admin_Forms_Settings( $data );
 			}
-			return $this->classes['admin_forms_settings_' . $data['class']];
+			return $this->classes[ 'admin_forms_settings_' . $data['class'] ];
 		}
 
 
diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 38d37836..f791dad2 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -2381,9 +2381,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							if ( $this->set_mode == 'password' && um_is_core_page( 'password-reset' ) ) {
 								$name = $key;
 							}
-						
-							$placeholder =  sprintf( __( 'Confirm %s', 'ultimate-member' ), $data['label'] );
-							
+
+							$placeholder = sprintf( __( 'Confirm %s', 'ultimate-member' ), $data['label'] );
+
 							$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $name ) . '" id="' . esc_attr( $key . UM()->form()->form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
 
 								</div>';
diff --git a/readme.txt b/readme.txt
index b738c407..a5347a71 100644
--- a/readme.txt
+++ b/readme.txt
@@ -170,7 +170,9 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
   - Fixed member directory sorting by the full name
   - Fixed registration form with not editable role field
   - Fixed PHP notice for the filter without field's label
+  - Fixed PHP notice on Admin_Form class initialization
   - Fixed style of the textarea field
+  - Fixed Confirm Password field's placeholder
 
 = 2.1.11: October 6, 2020 =