diff --git a/application/language/english/translations_lang.php b/application/language/english/translations_lang.php
index a9aadce4..22b00550 100755
--- a/application/language/english/translations_lang.php
+++ b/application/language/english/translations_lang.php
@@ -98,6 +98,8 @@ $lang['save'] = 'Save';
 $lang['new'] = 'New';
 $lang['select'] = 'Select';
 $lang['hide'] = 'Hide';
+$lang['visible'] = 'Visible';
+$lang['hidden'] = 'Hidden';
 $lang['type_to_filter_customers'] = 'Type to filter customers.';
 $lang['clear_fields_add_existing_customer_hint'] = 'Clear the fields and enter a new customer.';
 $lang['pick_existing_customer_hint'] = 'Pick an existing customer.';
@@ -170,6 +172,7 @@ $lang['company_link_hint'] = 'Company link should point to the official website
 $lang['go_to_booking_page'] = 'Go To Booking Page';
 $lang['settings_saved'] = 'Settings saved successfully.';
 $lang['general'] = 'General';
+$lang['client_form'] = 'Client Form';
 $lang['business_logic'] = 'Business Logic';
 $lang['current_user'] = 'Current User';
 $lang['about_app'] = 'About Easy!Appointments';
diff --git a/application/views/backend/settings.php b/application/views/backend/settings.php
index f3b758ad..13040851 100755
--- a/application/views/backend/settings.php
+++ b/application/views/backend/settings.php
@@ -38,6 +38,11 @@
                 <a class="nav-link" href="#general" data-toggle="tab"><?= lang('general') ?></a>
             </li>
         <?php endif ?>
+        <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE): ?>
+            <li class="nav-item">
+                <a class="nav-link" href="#client-form" data-toggle="tab"><?= lang('client_form') ?></a>
+            </li>
+        <?php endif ?>
         <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE): ?>
             <li class="nav-item">
                 <a class="nav-link" href="#business-logic" data-toggle="tab"><?= lang('business_logic') ?></a>
@@ -213,6 +218,63 @@
             </form>
         </div>
 
+        <!-- CLIENT FORM TAB -->
+
+        <?php $hidden = ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE) ? '' : 'd-none' ?>
+        <div class="tab-pane <?= $hidden ?>" id="client-form">
+            <form>
+                <fieldset>
+                    <legend class="border-bottom mb-4">
+                        <?= lang('client_form') ?>
+                        <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['edit'] == TRUE): ?>
+                            <button type="button" class="save-settings btn btn-primary btn-sm mb-2"
+                                    data-tippy-content="<?= lang('save') ?>">
+                                <i class="fas fa-check-square mr-2"></i>
+                                <?= lang('save') ?>
+                            </button>
+                        <?php endif ?>
+                    </legend>
+
+                    <div class="wrapper row">
+                        <div class="col-12 col-sm-6">
+                        <div class="form-group">
+                                    <label for="show-phone-number"><?= lang('phone_number') ?></label>
+                                <button id="show-phone-number" data-field="show_phone_number" type="button" class="form-control form-sub-button"><img src="<?= base_url('assets/img/eye.svg') ?>"/> <?= lang('visible') ?></button>
+                            </div>
+                            <div class="form-group">
+                                    <label for="show-address"><?= lang('address') ?></label>
+                                <button id="show-address" data-field="show_address" type="button" class="form-control form-sub-button"><img src="<?= base_url('assets/img/eye.svg') ?>"/> <?= lang('visible') ?></button>
+                            </div>
+                            <div class="form-group">
+                                    <label for="show-city"><?= lang('city') ?></label>
+                                <button id="show-city" data-field="show_city" type="button" class="form-control form-sub-button"><img src="<?= base_url('assets/img/eye.svg') ?>"/> <?= lang('visible') ?></button>
+                            </div>
+                            <div class="form-group">
+                                    <label for="show-zip-code"><?= lang('zip_code') ?></label>
+                                <button id="show-zip-code" data-field="show_zip_code" type="button" class="form-control form-sub-button"><img src="<?= base_url('assets/img/eye.svg') ?>"/> <?= lang('visible') ?></button>
+                            </div>
+                            <div class="form-group">
+                                    <label for="show-notes"><?= lang('notes') ?></label>
+                                <button id="show-notes" data-field="show_notes" type="button" class="form-control form-sub-button"><img src="<?= base_url('assets/img/eye.svg') ?>"/> <?= lang('visible') ?></button>
+                            </div>
+                        </div>
+                        
+                        <!-- <div class="col-12 col-sm-6">
+                        <div class="form-group">
+                                <label for="company-name"><?= lang('company_name') ?> *</label>
+                                <input id="company-name" data-field="company_name" class="required form-control">
+                                <span class="form-text text-muted">
+                                    <?= lang('company_name_hint') ?>
+                                </span>
+                            </div>
+                        </div> -->
+                    </div>
+
+
+                </fieldset>
+            </form>
+        </div>
+
         <!-- BUSINESS LOGIC TAB -->
 
         <?php $hidden = ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE) ? '' : 'd-none' ?>
diff --git a/assets/css/backend.css b/assets/css/backend.css
index 7351c02b..bd6fb870 100644
--- a/assets/css/backend.css
+++ b/assets/css/backend.css
@@ -280,6 +280,14 @@ body legend {
     margin: 5px;
 }
 
+.form-sub-button {
+    width: auto;
+}
+
+.form-sub-button img{
+    margin-top: -.3rem;
+}
+
 @media (min-width: 768px) {
     .backend-page .nav-pills li {
         width: auto;
@@ -840,6 +848,10 @@ body .form-horizontal .controls {
     max-width: 1024px;
 }
 
+#settings-page #client-form fieldset .wrapper {
+    max-width: 1024px;
+}
+
 #settings-page .working-plan-wrapper {
     max-width: 600px;
 }
diff --git a/assets/img/eye-hidden.svg b/assets/img/eye-hidden.svg
new file mode 100644
index 00000000..e69c69b1
--- /dev/null
+++ b/assets/img/eye-hidden.svg
@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg height="32px" version="1.1" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" xmlns:xlink="http://www.w3.org/1999/xlink"><title/><desc/><defs/><g fill="none" fill-rule="evenodd" id="Page-1" stroke="none" stroke-width="1"><g fill="#157EFB" id="icon-21-eye-hidden"><path d="M8.10869891,20.8913011 C4.61720816,18.8301147 3,16 3,16 C3,16 7,9 16,9 C17.3045107,9 18.5039752,9.14706466 19.6014388,9.39856122 L18.7519017,10.2480983 C17.8971484,10.0900546 16.9800929,10 16,10 C8,10 4.19995117,16 4.19995117,16 C4.19995117,16 5.71472808,18.3917225 8.84492713,20.1550729 L8.10869891,20.8913011 L8.10869891,20.8913011 L8.10869891,20.8913011 Z M12.398561,22.601439 C13.4960246,22.8529356 14.6954892,23.0000001 16,23 C25,22.999999 29,16 29,16 C29,16 27.3827918,13.1698856 23.8913008,11.1086992 L23.1550727,11.8449273 C26.2852719,13.6082776 27.8000488,16 27.8000488,16 C27.8000488,16 24,21.999999 16,22 C15.019907,22.0000001 14.1028515,21.9099455 13.2480981,21.7519019 L12.398561,22.601439 L12.398561,22.601439 L12.398561,22.601439 Z M19.8986531,15.1013469 C19.9649658,15.3902115 20,15.6910144 20,16 C20,18.2091391 18.2091391,20 16,20 C15.6910144,20 15.3902115,19.9649658 15.1013469,19.8986531 L16,19 C16.7677669,19.0000001 17.5355339,18.7071068 18.1213203,18.1213203 C18.7071068,17.5355339 19.0000001,16.7677669 19,16 L19.8986531,15.1013469 L19.8986531,15.1013469 L19.8986531,15.1013469 Z M16.8986531,12.1013469 C16.6097885,12.0350342 16.3089856,12 16,12 C13.7908609,12 12,13.7908609 12,16 C12,16.3089856 12.0350342,16.6097885 12.1013469,16.8986531 L13,16 C12.9999999,15.2322331 13.2928932,14.4644661 13.8786797,13.8786797 C14.4644661,13.2928932 15.2322331,12.9999999 16,13 L16.8986531,12.1013469 L16.8986531,12.1013469 L16.8986531,12.1013469 Z M24,7 L7,24 L8,25 L25,8 L24,7 L24,7 Z" id="eye-hidden"/></g></g></svg>
\ No newline at end of file
diff --git a/assets/img/eye.svg b/assets/img/eye.svg
new file mode 100644
index 00000000..74fd7b3e
--- /dev/null
+++ b/assets/img/eye.svg
@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg height="32px" version="1.1" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" xmlns:xlink="http://www.w3.org/1999/xlink"><title/><desc/><defs/><g fill="none" fill-rule="evenodd" id="Page-1" stroke="none" stroke-width="1"><g fill="#157EFB" id="icon-22-eye"><path d="M17,9 C8,9 4,16 4,16 C4,16 8,23.000001 17,23 C26,22.999999 30,16 30,16 C30,16 26,9 17,9 L17,9 Z M17,20 C19.2091391,20 21,18.2091391 21,16 C21,13.7908609 19.2091391,12 17,12 C14.7908609,12 13,13.7908609 13,16 C13,18.2091391 14.7908609,20 17,20 L17,20 Z M17,19 C18.6568543,19 20,17.6568543 20,16 C20,14.3431457 18.6568543,13 17,13 C15.3431457,13 14,14.3431457 14,16 C14,17.6568543 15.3431457,19 17,19 L17,19 Z M17,17 C17.5522848,17 18,16.5522848 18,16 C18,15.4477152 17.5522848,15 17,15 C16.4477152,15 16,15.4477152 16,16 C16,16.5522848 16.4477152,17 17,17 L17,17 Z" id="eye"/></g></g></svg>
\ No newline at end of file