diff --git a/dt-core/utilities/dt-components.php b/dt-core/utilities/dt-components.php
index 307dc692f7..bb77fe4f2a 100644
--- a/dt-core/utilities/dt-components.php
+++ b/dt-core/utilities/dt-components.php
@@ -67,6 +67,7 @@ public static function shared_attributes( $field_key, $fields, $post, $params =
         $shared_attributes = '
               id="' . esc_attr( $display_field_id ) . '"
               name="' . esc_attr( $field_key ) . '"
+              placeholder="' . esc_attr( $params['placeholder'] ?? '' ) . '"
               ' . $class . '
               ' . $label_attr . '
               ' . esc_html( $post_type ?? '' ) . '
diff --git a/dt-users/template-new-user.php b/dt-users/template-new-user.php
index 55b673d06e..8fd0f7e484 100644
--- a/dt-users/template-new-user.php
+++ b/dt-users/template-new-user.php
@@ -111,15 +111,48 @@
                                             </dl>
                                             <div id="contact-result"></div>
                                             <dl>
-                                                <dt><label for="eman"><?php esc_html_e( 'Display Name', 'disciple_tools' ); ?></label></dt>
-                                                <dd><input type="text" class="input" id="eman" placeholder="<?php esc_html_e( 'Nickname (Display Name)', 'disciple_tools' ); ?>" required autocomplete="off" /> </dd>
-                                                <dt><label for="liame"><?php esc_html_e( 'Email', 'disciple_tools' ); ?></label></dt>
-                                                <dd><input type="email" class="input" id="liame" placeholder="<?php esc_html_e( 'Email', 'disciple_tools' ); ?>" required autocomplete="off" /> </dd>
+                                                <dt></dt>
+                                                <dd>
+                                                <?php DT_Components::render_text( 'nickname', [
+                                                        'nickname' => [
+                                                            'name' => __( 'Display Name', 'disciple_tools' ),
+                                                            'type'        => 'text',
+                                                            'default' => '',
+                                                        ]
+                                                ], [], [ 'placeholder' => 'Nickname (Display Name)' ] ) ?>
+                                            </dd>
+                                                <dt></dt>
+                                                <dd>
+                                                <?php DT_Components::render_text( 'email', [
+                                                        'email' => [
+                                                            'name' => __( 'Email', 'disciple_tools' ),
+                                                            'type'        => 'text',
+                                                            'default' => '',
+                                                            'required' => true,
+                                                        ]
+                                                ], [], [ 'placeholder' => 'Email' ] ) ?>
+                                            </dd>
                                                 <div class="hidden-fields" style="display:none">
-                                                    <dt><label for="emanresu"><?php esc_html_e( 'Username', 'disciple_tools' ); ?></label></dt>
-                                                    <dd><input type="text" class="input" id="emanresu" placeholder="<?php esc_html_e( 'Username', 'disciple_tools' ); ?>" autocomplete="off" /> </dd>
-                                                    <dt><label for="drowssap"><?php esc_html_e( 'Password', 'disciple_tools' ); ?></label></dt>
-                                                    <dd><input type="password" class="input" id="drowssap" placeholder="<?php esc_html_e( 'Password', 'disciple_tools' ); ?>" autocomplete="off" /> </dd>
+                                                    <dt></dt>
+                                                    <dd>
+                                                    <?php DT_Components::render_text( 'username', [
+                                                        'username' => [
+                                                            'name' => __( 'Username', 'disciple_tools' ),
+                                                            'type'        => 'text',
+                                                            'default' => '',
+                                                        ]
+                                                    ], [], [ 'placeholder' => 'Username' ] ) ?>
+                                                </dd>
+                                                    <dt></dt>
+                                                    <dd>
+                                                    <?php DT_Components::render_text( 'password', [
+                                                        'password' => [
+                                                            'name' => __( 'Password', 'disciple_tools' ),
+                                                            'type'        => 'text',
+                                                            'default' => '',
+                                                        ]
+                                                    ], [], [ 'placeholder' => 'Password' ] ) ?>
+                                                </dd>
                                                 </div>
                                                 <?php if ( $current_user_can_manage_users ) : ?>
                                                 <div id="show-shield-banner" style="text-align: center; background-color:rgb(236, 245, 252);margin: 3px -15px 15px -15px;">
@@ -175,23 +208,36 @@
 
                                         <div id="optional-fields" class="cell medium-6 show-for-medium">
                                             <dl>
-                                                <dt><label for="first_name"><?php esc_html_e( 'First Name', 'disciple_tools' )?> (<?php esc_html_e( 'optional', 'disciple_tools' )?>)</label></dt>
-                                                <dd><input class="input" type="text" class="input" id="first_name" data-optional
-                                                        name="first_name" placeholder="<?php esc_html_e( 'First Name', 'disciple_tools' )?>" />
+                                                <dt></dt>
+                                                <dd>
+                                                    <?php DT_Components::render_text( 'first_name', [
+                                                        'first_name' => [
+                                                            'name' => __( 'First Name (optional)', 'disciple_tools' ),
+                                                            'type'        => 'text',
+                                                            'default' => '',
+                                                        ]
+                                                    ], [], [ 'placeholder' => 'First Name' ] ) ?>
                                                 </dd>
-                                                <dt><label for="last_name"><?php esc_html_e( 'Last Name', 'disciple_tools' )?> (<?php esc_html_e( 'optional', 'disciple_tools' )?>)</label></dt>
-                                                <dd><input class="input" type="text" class="input" id="last_name" data-optional name="last_name" placeholder="<?php esc_html_e( 'Last Name', 'disciple_tools' )?>"/></dd>
-                                                <dt><label for="gender">
-                                                        <?php esc_html_e( 'Gender', 'disciple_tools' ) ?> (<?php esc_html_e( 'optional', 'disciple_tools' )?>)
-                                                    </label></dt>
+                                                <dt></dt>
                                                 <dd>
-                                                    <select class="select-field" id="gender" style="width:auto; display: block" data-optional>
-                                                        <?php foreach ( $gender_fields['default'] as $option_key => $option_value ): ?>
-                                                            <option value="<?php echo esc_html( $option_key )?>">
-                                                                <?php echo esc_html( $option_value['label'] ) ?>
-                                                            </option>
-                                                        <?php endforeach; ?>
-                                                    </select>
+                                                    <?php DT_Components::render_text( 'last_name', [
+                                                        'last_name' => [
+                                                            'name' => __( 'Last Name (optional)', 'disciple_tools' ),
+                                                            'type'        => 'text',
+                                                            'default' => '',
+                                                        ]
+                                                    ], [], [ 'placeholder' => 'Last Name' ] ) ?>
+                                                </dd>
+                                                <dt></dt>
+                                                <dd>
+                                                <?php DT_Components::render_key_select( 'gender', [
+                                                        'gender' => [
+                                                            'name' => __( 'Gender (optional)', 'disciple_tools' ),
+                                                            'type'        => 'key_select',
+                                                            'default' => $gender_fields['default'],
+                                                            'select_cannot_be_empty' => true,
+                                                        ]
+                                                ], [ 'gender' => [ 'key' => 'male' ] ], [] ) ?>
                                                 </dd>
 
                                                 <?php // site defined fields
@@ -201,23 +247,23 @@
                                                     }
                                                     ?>
                                                     <dt>
-                                                        <label for="<?php echo esc_attr( $dt_field['key'] ) ?>"><?php echo esc_html( $dt_field['label'] ) ?> (<?php esc_html_e( 'optional', 'disciple_tools' )?>)</label>
                                                     </dt>
-                                                    <dd><input type="text"
-                                                            data-optional
-                                                            class="input"
-                                                            id="<?php echo esc_attr( $dt_field['key'] ) ?>"
-                                                            name="<?php echo esc_attr( $dt_field['key'] ) ?>"
-                                                            placeholder="<?php echo esc_html( $dt_field['label'] ) ?>"
-                                                            value=""/>
+                                                    <dd>
+                                                        <?php DT_Components::render_text( $dt_field['key'], [
+                                                            $dt_field['key'] => [
+                                                                'name' => $dt_field['label'],
+                                                                'type'        => 'text',
+                                                                'default' => '',
+                                                            ]
+                                                        ], [], [ 'placeholder' => $dt_field['label'], 'data-optional' => true ] ) ?>
                                                     </dd>
                                                     <?php
                                                 } // end foreach
                                                 ?>
 
                                                 <dt><label for="description"><?php esc_html_e( 'Biography', 'disciple_tools' )?> (<?php esc_html_e( 'optional', 'disciple_tools' )?>)</label></dt>
-                                                <dd><textarea
-                                                        type="text" class="input" id="description"
+                                                <dd><dt-textarea
+                                                        class="input" id="description"
                                                         name="description"
                                                         placeholder="<?php esc_html_e( 'Biography', 'disciple_tools' )?>"
                                                         rows="5"
diff --git a/dt-users/template-user-management.php b/dt-users/template-user-management.php
index bd81da38d8..819b2dfec8 100644
--- a/dt-users/template-user-management.php
+++ b/dt-users/template-user-management.php
@@ -9,6 +9,7 @@
 $dt_url_path = dt_get_url_path();
 $dt_user_fields = Disciple_Tools_Users::get_users_fields();
 $default_user_roles = Disciple_Tools_Roles::get_dt_roles_and_permissions();
+$gender_fields = DT_Posts::get_post_settings( 'contacts' )['fields']['gender'];
 
 ?>
 
@@ -102,22 +103,25 @@
                                     <!-- User Status -->
                                     <div class="bordered-box" style="--dt-label-font-size: 1.2rem; --dt-label-font-weight: 300;">
                                         <h4><?php esc_html_e( 'User Status', 'disciple_tools' ); ?></h4>
-                                        <select id="user_status" class="select-field">
-                                            <option></option>
-                                            <?php foreach ( $dt_user_fields['user_status']['options'] as $status_key => $status_value ) : ?>
-                                                <option value="<?php echo esc_html( $status_key ); ?>"><?php echo esc_html( $status_value['label'] ); ?></option>
-                                            <?php endforeach; ?>
-                                        </select>
+                                        <?php DT_Components::render_key_select( 'user_status', [
+                                                        'user_status' => [
+                                                            'name' => '',
+                                                            'type'        => 'key_select',
+                                                            'default' => $dt_user_fields['user_status']['options'],
+                                                            'select_cannot_be_empty' => true,
+                                                        ]
+                                        ], [ 'key_select' => [ 'key' => 'active' ] ], [] ) ?>
 
                                         <!-- Workload Status -->
                                         <h4><?php esc_html_e( 'Workload Status', 'disciple_tools' ); ?></h4>
-                                        <select id="workload_status" class="select-field">
-                                            <?php $workload_status_options = $dt_user_fields['workload_status']['options'] ?? [] ?>
-                                            <option></option>
-                                            <?php foreach ( $workload_status_options as $key => $val ) : ?>
-                                                <option value="<?php echo esc_html( $key ) ?>"><?php echo esc_html( $val['label'] ) ?></option>
-                                            <?php endforeach; ?>
-                                        </select>
+                                        <?php DT_Components::render_key_select( 'workload_status', [
+                                                         'workload_status' => [
+                                                             'name' => '',
+                                                             'type'        => 'key_select',
+                                                             'default' => $dt_user_fields['workload_status']['options'],
+                                                            'select_cannot_be_empty' => true,
+                                                         ]
+                                        ], [ 'key_select' => [ 'key' => 'active' ] ], [ 'key_select' => [ 'disable_color' => true ] ] ) ?>
 
                                         <!-- Locations -->
                                         <?php if ( DT_Mapbox_API::get_key() ) : /* If Mapbox is enabled. */?>
@@ -225,16 +229,25 @@ class="dt_multi_select empty-select-button select-button button ">
                                         <p>
                                             <?php esc_html_e( 'Display Name', 'disciple_tools' ); ?>
                                             <span id="<?php echo esc_html( 'update_display_name' ); ?>-spinner" class="loading-spinner"></span>
-                                            <input type="text" id="update_display_name" class="text-input">
+                                            <?php DT_Components::render_text( 'update_display_name', [
+                                                'update_display_name' => [
+                                                    'name' => '',
+                                                    'type'        => 'text',
+                                                    'default' => '',
+                                                ]
+                                            ], [], [ 'placeholder' => __( 'Display Name', 'disciple_tools' ) ] ) ?>
                                         </p>
 
                                         <?php esc_html_e( 'Gender', 'disciple_tools' ); ?>
                                         <span id="<?php echo esc_html( 'gender' ); ?>-spinner" class="loading-spinner"></span>
-                                        <select class="select-field" id="gender">
-                                            <option></option>
-                                            <option value="male"><?php esc_html_e( 'Male', 'disciple_tools' ); ?></option>
-                                            <option value="female"><?php esc_html_e( 'Female', 'disciple_tools' ); ?></option>
-                                        </select>
+                                        <?php DT_Components::render_key_select( 'gender', [
+                                                        'gender' => [
+                                                            'name' => '',
+                                                            'type'        => 'key_select',
+                                                            'default' => $gender_fields['default'],
+                                                            'select_cannot_be_empty' => true,
+                                                        ]
+                                        ], [], [] ) ?>
 
                                         <?php // site defined fields
                                         $dt_user_fields = dt_get_site_custom_lists( 'user_fields' );
@@ -248,13 +261,15 @@ class="dt_multi_select empty-select-button select-button button ">
                                                     <span id="<?php echo esc_html( $dt_field['key'] ); ?>-spinner" class="loading-spinner"></span>
                                                 </label>
                                             </dt>
-                                            <dd><input type="text"
-                                                       data-optional
-                                                       class="input text-input"
-                                                       id="<?php echo esc_attr( $dt_field['key'] ) ?>"
-                                                       name="<?php echo esc_attr( $dt_field['key'] ) ?>"
-                                                       placeholder="<?php echo esc_html( $dt_field['label'] ) ?>"
-                                                       value=""/>
+                                            <dd>
+                                                <?php DT_Components::render_text( $dt_field['key'], [
+                                                     $dt_field['key'] => [
+                                                         'name' => '',
+                                                         'type'        => 'text',
+                                                         'default' => '',
+                                                         'data-optional' => true,
+                                                     ]
+                                                ], [], [ 'placeholder' => $dt_field['label'] ] ) ?>
                                             </dd>
                                             <?php
                                         } // end foreach
diff --git a/dt-users/user-management.js b/dt-users/user-management.js
index e58c145956..612f0fd561 100644
--- a/dt-users/user-management.js
+++ b/dt-users/user-management.js
@@ -539,8 +539,8 @@ jQuery(document).ready(function ($) {
                 <a id="app_link_${app_key}" ${activated ? '' : 'disabled'} class="button" href="${url}" target="_blank" style="margin-right: 5px;">${window.SHAREDFUNCTIONS.escapeHTML(magic_link['label'])} <img class="dt-icon dt-white-icon" src="${window.SHAREDFUNCTIONS.escapeHTML(window.dt_user_management_localized?.theme_uri)}dt-assets/images/open-link.svg"/></a>
             </td>
             <td style="vertical-align: top;">
-                <input id="app_state_${app_key}"
-                        class="switch-input app-state-switches" type="checkbox"
+                <dt-toggle id="app_state_${app_key}"
+                        class="app-state-switches" type="checkbox"
                         data-user_id="${user_id}" data-app_key="${app_key}" data-app_root="${app?.root}" data-app_type="${app?.type}"
                         ${activated ? 'checked' : ''}
                 />