diff --git a/includes/admin/core/class-admin-forms.php b/includes/admin/core/class-admin-forms.php
index e27d96d9..05608175 100644
--- a/includes/admin/core/class-admin-forms.php
+++ b/includes/admin/core/class-admin-forms.php
@@ -31,6 +31,12 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
 		}
 
 
+		function set_data( $data ) {
+		    $this->form_data = $data;
+		    return $this;
+        }
+
+
 		/**
 		 * Render form
 		 *
@@ -247,7 +253,6 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
 					$html .= call_user_func( array( &$this, 'render_' . $data['type'] ), $data );
 
 				} else {
-
 					$html .= $this->render_field_by_hook( $data );
 
 				}
@@ -304,6 +309,9 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
 			$for_attr = ' for="' . $id . '" ';
 
 			$label = $data['label'];
+			if ( isset( $data['required'] ) && $data['required'] )
+		        $label = $label . '<span class="um-req" title="'.__('Required','ultimate-member').'">*</span>';
+
 			$tooltip = ! empty( $data['tooltip'] ) ? UM()->tooltip( $data['tooltip'], false, false ) : '';
 
 			return "<label $for_attr>$label $tooltip</label>";
diff --git a/includes/class-init.php b/includes/class-init.php
index 61449315..ae7210b6 100644
--- a/includes/class-init.php
+++ b/includes/class-init.php
@@ -855,7 +855,7 @@ if ( ! class_exists( 'UM' ) ) {
 		 * @param $data array
 		 * @return um\admin\core\Admin_Forms()
 		 */
-		function admin_forms( $data ) {
+		function admin_forms( $data = false ) {
 			if ( empty( $this->classes['admin_forms_' . $data['class']] ) ) {
 				$this->classes['admin_forms_' . $data['class']] = new um\admin\core\Admin_Forms( $data );
 			}
@@ -869,7 +869,7 @@ if ( ! class_exists( 'UM' ) ) {
 		 * @param $data array
 		 * @return um\admin\core\Admin_Forms_Settings()
 		 */
-		function admin_forms_settings( $data ) {
+		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 );
 			}
diff --git a/includes/core/class-builtin.php b/includes/core/class-builtin.php
index 6870eceb..b7c73ef1 100644
--- a/includes/core/class-builtin.php
+++ b/includes/core/class-builtin.php
@@ -1292,8 +1292,6 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 
 			$all = UM()->fields()->array_sort_by_column( $all, 'title');
 
-			$all = array( 0 => '') + $all;
-
 			return $all;
 		}
 
diff --git a/includes/core/um-filters-fields.php b/includes/core/um-filters-fields.php
index d0018551..a7d5a43c 100644
--- a/includes/core/um-filters-fields.php
+++ b/includes/core/um-filters-fields.php
@@ -10,7 +10,6 @@
  * @return string
  */
 function um_edit_label_all_fields( $label, $data ) {
-
 	$asterisk = UM()->options()->get( 'form_asterisk' );
 	if ( $asterisk && isset( $data['required'] ) && $data['required'] == 1 )
 		$label = $label . '<span class="um-req" title="'.__('Required','ultimate-member').'">*</span>';