diff --git a/src/app/components/modules/Settings.jsx b/src/app/components/modules/Settings.jsx
index 98ef357bfb..38d8d70725 100644
--- a/src/app/components/modules/Settings.jsx
+++ b/src/app/components/modules/Settings.jsx
@@ -49,40 +49,55 @@ class Settings extends React.Component {
                 'about',
                 'location',
                 'website',
+                'witness_owner',
+                'witness_description',
+                'account_is_witness',
             ],
             initialValues: props.profile,
-            validation: values => ({
-                profile_image:
-                    values.profile_image &&
-                    !/^https?:\/\//.test(values.profile_image)
-                        ? tt('settings_jsx.invalid_url')
-                        : null,
-                cover_image:
-                    values.cover_image &&
-                    !/^https?:\/\//.test(values.cover_image)
-                        ? tt('settings_jsx.invalid_url')
-                        : null,
-                name:
-                    values.name && values.name.length > 20
-                        ? tt('settings_jsx.name_is_too_long')
-                        : values.name && /^\s*@/.test(values.name)
-                          ? tt('settings_jsx.name_must_not_begin_with')
-                          : null,
-                about:
-                    values.about && values.about.length > 160
-                        ? tt('settings_jsx.about_is_too_long')
-                        : null,
-                location:
-                    values.location && values.location.length > 30
-                        ? tt('settings_jsx.location_is_too_long')
-                        : null,
-                website:
-                    values.website && values.website.length > 100
-                        ? tt('settings_jsx.website_url_is_too_long')
-                        : values.website && !/^https?:\/\//.test(values.website)
-                          ? tt('settings_jsx.invalid_url')
-                          : null,
-            }),
+            validation: values => {
+                return {
+                    profile_image:
+                        values.profile_image &&
+                        !/^https?:\/\//.test(values.profile_image)
+                            ? tt('settings_jsx.invalid_url')
+                            : null,
+                    cover_image:
+                        values.cover_image &&
+                        !/^https?:\/\//.test(values.cover_image)
+                            ? tt('settings_jsx.invalid_url')
+                            : null,
+                    name:
+                        values.name && values.name.length > 20
+                            ? tt('settings_jsx.name_is_too_long')
+                            : values.name && /^\s*@/.test(values.name)
+                              ? tt('settings_jsx.name_must_not_begin_with')
+                              : null,
+                    about:
+                        values.about && values.about.length > 160
+                            ? tt('settings_jsx.about_is_too_long')
+                            : null,
+                    location:
+                        values.location && values.location.length > 30
+                            ? tt('settings_jsx.location_is_too_long')
+                            : null,
+                    website:
+                        values.website && values.website.length > 100
+                            ? tt('settings_jsx.website_url_is_too_long')
+                            : values.website &&
+                              !/^https?:\/\//.test(values.website)
+                              ? tt('settings_jsx.invalid_url')
+                              : null,
+                    witness_owner:
+                        values.witness_owner && values.witness_owner.length > 30
+                            ? tt('settings_jsx.witness_owner_is_too_long')
+                            : null,
+                    witness_description:
+                        values.witness_description &&
+                        values.witness_description.length > 512
+                            ? tt('settings_jsx.witness_description_is_too_long')
+                            : null,
+                };
+            },
         });
         this.handleSubmitForm = this.state.accountSettings.handleSubmit(args =>
             this.handleSubmit(args)
@@ -151,6 +166,8 @@ class Settings extends React.Component {
             about,
             location,
             website,
+            witness_owner,
+            witness_description,
         } = this.state;
 
         // Update relevant fields
@@ -160,6 +177,8 @@ class Settings extends React.Component {
         metaData.profile.about = about.value;
         metaData.profile.location = location.value;
         metaData.profile.website = website.value;
+        metaData.profile.witness_owner = witness_owner.value;
+        metaData.profile.witness_description = witness_description.value;
         metaData.profile.version = 2; // signal upgrade to posting_json_metadata
 
         // Remove empty keys
@@ -170,6 +189,10 @@ class Settings extends React.Component {
         if (!metaData.profile.about) delete metaData.profile.about;
         if (!metaData.profile.location) delete metaData.profile.location;
         if (!metaData.profile.website) delete metaData.profile.website;
+        if (!metaData.profile.witness_owner)
+            delete metaData.profile.witness_owner;
+        if (!metaData.profile.witness_description)
+            delete metaData.profile.witness_description;
 
         const { account, updateAccount } = this.props;
         this.setState({ loading: true });
@@ -305,7 +328,10 @@ class Settings extends React.Component {
             about,
             location,
             website,
+            witness_owner,
+            witness_description,
             progress,
+            account_is_witness,
         } = this.state;
 
         const preferred_api_endpoint = this.getPreferredApiEndpoint();
@@ -317,7 +343,7 @@ class Settings extends React.Component {
                         isOwnAccount && (
                             <form
                                 onSubmit={this.handleSubmitForm}
-                                className="small-12 medium-6 large-4 columns"
+                                className="large-12 columns"
                             >
                                 <h4>
                                     {tt('settings_jsx.public_profile_settings')}
@@ -334,107 +360,173 @@ class Settings extends React.Component {
                                         {progress.error}
                                     </div>
                                 )}
-                                <label>
-                                    {tt('settings_jsx.profile_image_url')}
-                                    <Dropzone
-                                        onDrop={this.onDrop}
-                                        className={'none'}
-                                        disableClick
-                                        multiple={false}
-                                        accept="image/*"
-                                        ref={node => {
-                                            this.dropzone = node;
-                                        }}
-                                    >
-                                        <input
-                                            type="url"
-                                            {...profile_image.props}
-                                            autoComplete="off"
-                                        />
-                                    </Dropzone>
-                                    <a
-                                        onClick={() =>
-                                            this.onOpenClick('profile_image')
-                                        }
-                                    >
-                                        {tt('settings_jsx.upload_image')}
-                                    </a>
-                                </label>
-                                <div className="error">
-                                    {profile_image.blur &&
-                                        profile_image.touched &&
-                                        profile_image.error}
-                                </div>
-                                <label>
-                                    {tt('settings_jsx.cover_image_url')}{' '}
-                                    <small>(Optimal: 2048 x 512 pixels)</small>
-                                    <input
-                                        type="url"
-                                        {...cover_image.props}
-                                        autoComplete="off"
-                                    />
-                                    <a
-                                        onClick={() =>
-                                            this.onOpenClick('cover_image')
-                                        }
-                                    >
-                                        {tt('settings_jsx.upload_image')}
-                                    </a>
-                                </label>
-                                <div className="error">
-                                    {cover_image.blur &&
-                                        cover_image.touched &&
-                                        cover_image.error}
-                                </div>
-                                <label>
-                                    {tt('settings_jsx.profile_name')}
-                                    <input
-                                        type="text"
-                                        {...name.props}
-                                        maxLength="20"
-                                        autoComplete="off"
-                                    />
-                                </label>
-                                <div className="error">
-                                    {name.touched && name.error}
-                                </div>
-                                <label>
-                                    {tt('settings_jsx.profile_about')}
-                                    <input
-                                        type="text"
-                                        {...about.props}
-                                        maxLength="160"
-                                        autoComplete="off"
-                                    />
-                                </label>
-                                <div className="error">
-                                    {about.touched && about.error}
-                                </div>
-                                <label>
-                                    {tt('settings_jsx.profile_location')}
-                                    <input
-                                        type="text"
-                                        {...location.props}
-                                        maxLength="30"
-                                        autoComplete="off"
-                                    />
-                                </label>
-                                <div className="error">
-                                    {location.touched && location.error}
-                                </div>
-                                <label>
-                                    {tt('settings_jsx.profile_website')}
-                                    <input
-                                        type="url"
-                                        {...website.props}
-                                        maxLength="100"
-                                        autoComplete="off"
-                                    />
-                                </label>
-                                <div className="error">
-                                    {website.blur &&
-                                        website.touched &&
-                                        website.error}
+                                <div className="form__fields row">
+                                    <div className="form__field column small-12 medium-6 large-4">
+                                        <label>
+                                            {tt(
+                                                'settings_jsx.profile_image_url'
+                                            )}
+                                            <Dropzone
+                                                onDrop={this.onDrop}
+                                                className={'none'}
+                                                disableClick
+                                                multiple={false}
+                                                accept="image/*"
+                                                ref={node => {
+                                                    this.dropzone = node;
+                                                }}
+                                            >
+                                                <input
+                                                    type="url"
+                                                    {...profile_image.props}
+                                                    autoComplete="off"
+                                                />
+                                            </Dropzone>
+                                            <a
+                                                onClick={() =>
+                                                    this.onOpenClick(
+                                                        'profile_image'
+                                                    )
+                                                }
+                                            >
+                                                {tt(
+                                                    'settings_jsx.upload_image'
+                                                )}
+                                            </a>
+                                        </label>
+                                        <div className="error">
+                                            {profile_image.blur &&
+                                                profile_image.touched &&
+                                                profile_image.error}
+                                        </div>
+                                    </div>
+                                    <div className="form__field column small-12 medium-6 large-4">
+                                        <label>
+                                            {tt('settings_jsx.cover_image_url')}{' '}
+                                            <small>
+                                                (Optimal: 2048 x 512 pixels)
+                                            </small>
+                                            <input
+                                                type="url"
+                                                {...cover_image.props}
+                                                autoComplete="off"
+                                            />
+                                            <a
+                                                onClick={() =>
+                                                    this.onOpenClick(
+                                                        'cover_image'
+                                                    )
+                                                }
+                                            >
+                                                {tt(
+                                                    'settings_jsx.upload_image'
+                                                )}
+                                            </a>
+                                        </label>
+                                        <div className="error">
+                                            {cover_image.blur &&
+                                                cover_image.touched &&
+                                                cover_image.error}
+                                        </div>
+                                    </div>
+                                    <div className="form__field column small-12 medium-6 large-4">
+                                        <label>
+                                            {tt('settings_jsx.profile_name')}
+                                            <input
+                                                type="text"
+                                                {...name.props}
+                                                maxLength="20"
+                                                autoComplete="off"
+                                            />
+                                        </label>
+                                        <div className="error">
+                                            {name.touched && name.error}
+                                        </div>
+                                    </div>
+                                    <div className="form__field column small-12 medium-6 large-4">
+                                        <label>
+                                            {tt('settings_jsx.profile_about')}
+                                            <input
+                                                type="text"
+                                                {...about.props}
+                                                maxLength="160"
+                                                autoComplete="off"
+                                            />
+                                        </label>
+                                        <div className="error">
+                                            {about.touched && about.error}
+                                        </div>
+                                    </div>
+                                    <div className="form__field column small-12 medium-6 large-4">
+                                        <label>
+                                            {tt(
+                                                'settings_jsx.profile_location'
+                                            )}
+                                            <input
+                                                type="text"
+                                                {...location.props}
+                                                maxLength="30"
+                                                autoComplete="off"
+                                            />
+                                        </label>
+                                        <div className="error">
+                                            {location.touched && location.error}
+                                        </div>
+                                    </div>
+                                    <div className="form__field column small-12 medium-6 large-4">
+                                        <label>
+                                            {tt('settings_jsx.profile_website')}
+                                            <input
+                                                type="url"
+                                                {...website.props}
+                                                maxLength="100"
+                                                autoComplete="off"
+                                            />
+                                        </label>
+                                        <div className="error">
+                                            {website.blur &&
+                                                website.touched &&
+                                                website.error}
+                                        </div>
+                                    </div>
+                                    {account_is_witness.value && (
+                                        <div className="form__field column small-12 medium-6 large-4">
+                                            <label>
+                                                {tt(
+                                                    'settings_jsx.profile_witness_description'
+                                                )}
+                                                <input
+                                                    type="text"
+                                                    {...witness_description.props}
+                                                    maxLength="160"
+                                                    autoComplete="off"
+                                                />
+                                            </label>
+                                            <div className="error">
+                                                {witness_description.touched &&
+                                                    witness_description.error}
+                                            </div>
+                                        </div>
+                                    )}
+                                    {account_is_witness.value && (
+                                        <div className="form__field column small-12 medium-6 large-4">
+                                            <label>
+                                                {tt(
+                                                    'settings_jsx.profile_witness_owner'
+                                                )}
+                                                <input
+                                                    type="text"
+                                                    {...witness_owner.props}
+                                                    maxLength="30"
+                                                    autoComplete="off"
+                                                />
+                                            </label>
+                                            <div className="error">
+                                                {witness_owner.touched &&
+                                                    witness_owner.error}
+                                            </div>
+                                        </div>
+                                    )}
                                 </div>
                                 {state.loading && (
                                     <span>
@@ -466,126 +558,165 @@ class Settings extends React.Component {
 
                 {isOwnAccount && (
                     <div className="row">
-                        <div className="small-12 medium-4 large-4 columns">
+                        <div className="large-12 columns">
                             <br />
                             <br />
                             <h4>{tt('settings_jsx.preferences')}</h4>
-
-                            <label>
-                                {tt('g.choose_language')}
-                                <select
-                                    defaultValue={user_preferences.locale}
-                                    onChange={this.handleLanguageChange}
-                                >
-                                    <option value="en">English</option>
-                                    <option value="es">Spanish Español</option>
-                                    <option value="ru">Russian русский</option>
-                                    <option value="fr">French français</option>
-                                    <option value="it">Italian italiano</option>
-                                    <option value="ko">Korean 한국어</option>
-                                    <option value="ja">Japanese 日本語</option>
-                                    <option value="pl">Polish</option>
-                                    <option value="zh">Chinese 简体中文</option>
-                                </select>
-                            </label>
-                            <br />
-
-                            <label>
-                                {tt(
-                                    'settings_jsx.not_safe_for_work_nsfw_content'
-                                )}
-                            </label>
-                            <select
-                                value={user_preferences.nsfwPref}
-                                onChange={this.onNsfwPrefChange}
-                            >
-                                <option value="hide">
-                                    {tt('settings_jsx.always_hide')}
-                                </option>
-                                <option value="warn">
-                                    {tt('settings_jsx.always_warn')}
-                                </option>
-                                <option value="show">
-                                    {tt('settings_jsx.always_show')}
-                                </option>
-                            </select>
-                            <br />
-                            <br />
-
-                            <label>
-                                {tt('settings_jsx.choose_default_blog_payout')}
-                                <select
-                                    defaultValue={
-                                        user_preferences.defaultBlogPayout ||
-                                        '50%'
-                                    }
-                                    onChange={
-                                        this.handleDefaultBlogPayoutChange
-                                    }
-                                >
-                                    <option value="0%">
-                                        {tt('reply_editor.decline_payout')}
-                                    </option>
-                                    <option value="50%">
-                                        {tt('reply_editor.default_50_50')}
-                                    </option>
-                                    <option value="100%">
-                                        {tt('reply_editor.power_up_100')}
-                                    </option>
-                                </select>
-                            </label>
-                            <br />
-
-                            <label>
-                                {tt(
-                                    'settings_jsx.choose_default_comment_payout'
-                                )}
-                                <select
-                                    defaultValue={
-                                        user_preferences.defaultCommentPayout ||
-                                        '50%'
-                                    }
-                                    onChange={
-                                        this.handleDefaultCommentPayoutChange
-                                    }
-                                >
-                                    <option value="0%">
-                                        {tt('reply_editor.decline_payout')}
-                                    </option>
-                                    <option value="50%">
-                                        {tt('reply_editor.default_50_50')}
-                                    </option>
-                                    <option value="100%">
-                                        {tt('reply_editor.power_up_100')}
-                                    </option>
-                                </select>
-                            </label>
-
-                            <label>
-                                {tt(
-                                    'settings_jsx.choose_preferred_api_endpoint'
-                                )}
-                                <select
-                                    defaultValue={preferred_api_endpoint}
-                                    onChange={
-                                        this.handlePreferredAPIEndpointChange
-                                    }
-                                >
-                                    <option value={preferred_api_endpoint}>
-                                        {preferred_api_endpoint}
-                                    </option>
-
-                                    {this.generateAPIEndpointOptions()}
-                                </select>
-                            </label>
-                            <br />
+                            <div className="form__fields row">
+                                <div className="form__field column small-12 medium-6 large-4">
+                                    <label>
+                                        {tt('g.choose_language')}
+                                        <select
+                                            defaultValue={
+                                                user_preferences.locale
+                                            }
+                                            onChange={this.handleLanguageChange}
+                                        >
+                                            <option value="en">English</option>
+                                            <option value="es">
+                                                Spanish Español
+                                            </option>
+                                            <option value="ru">
+                                                Russian русский
+                                            </option>
+                                            <option value="fr">
+                                                French français
+                                            </option>
+                                            <option value="it">
+                                                Italian italiano
+                                            </option>
+                                            <option value="ko">
+                                                Korean 한국어
+                                            </option>
+                                            <option value="ja">
+                                                Japanese 日本語
+                                            </option>
+                                            <option value="pl">Polish</option>
+                                            <option value="zh">
+                                                Chinese 简体中文
+                                            </option>
+                                        </select>
+                                    </label>
+                                </div>
+                                <div className="form__field column small-12 medium-6 large-4">
+                                    <label>
+                                        {tt(
+                                            'settings_jsx.not_safe_for_work_nsfw_content'
+                                        )}
+                                        <select
+                                            value={user_preferences.nsfwPref}
+                                            onChange={this.onNsfwPrefChange}
+                                        >
+                                            <option value="hide">
+                                                {tt('settings_jsx.always_hide')}
+                                            </option>
+                                            <option value="warn">
+                                                {tt('settings_jsx.always_warn')}
+                                            </option>
+                                            <option value="show">
+                                                {tt('settings_jsx.always_show')}
+                                            </option>
+                                        </select>
+                                    </label>
+                                </div>
+                                <div className="form__field column small-12 medium-6 large-4">
+                                    <label>
+                                        {tt(
+                                            'settings_jsx.choose_default_blog_payout'
+                                        )}
+                                        <select
+                                            defaultValue={
+                                                user_preferences.defaultBlogPayout ||
+                                                '50%'
+                                            }
+                                            onChange={
+                                                this
+                                                    .handleDefaultBlogPayoutChange
+                                            }
+                                        >
+                                            <option value="0%">
+                                                {tt(
+                                                    'reply_editor.decline_payout'
+                                                )}
+                                            </option>
+                                            <option value="50%">
+                                                {tt(
+                                                    'reply_editor.default_50_50'
+                                                )}
+                                            </option>
+                                            <option value="100%">
+                                                {tt(
+                                                    'reply_editor.power_up_100'
+                                                )}
+                                            </option>
+                                        </select>
+                                    </label>
+                                </div>
+                                <div className="form__field column small-12 medium-6 large-4">
+                                    <label>
+                                        {tt(
+                                            'settings_jsx.choose_default_comment_payout'
+                                        )}
+                                        <select
+                                            defaultValue={
+                                                user_preferences.defaultCommentPayout ||
+                                                '50%'
+                                            }
+                                            onChange={
+                                                this
+                                                    .handleDefaultCommentPayoutChange
+                                            }
+                                        >
+                                            <option value="0%">
+                                                {tt(
+                                                    'reply_editor.decline_payout'
+                                                )}
+                                            </option>
+                                            <option value="50%">
+                                                {tt(
+                                                    'reply_editor.default_50_50'
+                                                )}
+                                            </option>
+                                            <option value="100%">
+                                                {tt(
+                                                    'reply_editor.power_up_100'
+                                                )}
+                                            </option>
+                                        </select>
+                                    </label>
+                                </div>
+                                <div className="form__field column small-12 medium-6 large-4">
+                                    <label>
+                                        {tt(
+                                            'settings_jsx.choose_preferred_api_endpoint'
+                                        )}
+                                        <select
+                                            defaultValue={
+                                                preferred_api_endpoint
+                                            }
+                                            onChange={
+                                                this
+                                                    .handlePreferredAPIEndpointChange
+                                            }
+                                        >
+                                            <option
+                                                value={preferred_api_endpoint}
+                                            >
+                                                {preferred_api_endpoint}
+                                            </option>
+
+                                            {this.generateAPIEndpointOptions()}
+                                        </select>
+                                    </label>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 )}
                 {ignores &&
                     ignores.size > 0 && (
                         <div className="row">
-                            <div className="small-12 medium-6 large-6 columns">
+                            <div className="small-12 medium-6 large-4 large-6 columns">
                                 <br />
                                 <h4>Muted Users</h4>
                                 <MuteList
@@ -602,9 +733,11 @@ class Settings extends React.Component {
 
 function read_profile_v2(account) {
     if (!account) return {};
+    const accountIsWitness = account.get('account_is_witness');
 
     // use new `posting_json_md` if {version: 2} is present
     let md = o2j.ifStringParseJSON(account.get('posting_json_metadata'));
+    md.profile.account_is_witness = accountIsWitness;
     if (md && md.profile && md.profile.version) return md;
 
     // otherwise, fall back to `json_metadata`
@@ -642,7 +775,6 @@ export default connect(
             accountname,
             isOwnAccount,
             ignores,
-            user_preferences: state.app.get('user_preferences').toJS(),
             walletUrl: state.app.get('walletUrl'),
             profile,
             follow: state.global.get('follow'),
diff --git a/src/app/components/modules/Settings.scss b/src/app/components/modules/Settings.scss
index 9269771c10..0a245df023 100644
--- a/src/app/components/modules/Settings.scss
+++ b/src/app/components/modules/Settings.scss
@@ -1,4 +1,3 @@
-
 .Settings {
 	.button {
 		text-decoration: none;
@@ -62,4 +61,10 @@
         font-family: $font-primary;
         font-size: 1.125rem!important;
     }
+    form .form__field {
+        margin: 0;
+    }
+    .form__field {
+        margin-bottom: 10px
+    }
 }
diff --git a/src/app/locales/en.json b/src/app/locales/en.json
index e2a68c0ef3..ab4a45cb19 100644
--- a/src/app/locales/en.json
+++ b/src/app/locales/en.json
@@ -707,6 +707,8 @@
         "location_is_too_long": "Location is too long",
         "website_url_is_too_long": "Website URL is too long",
         "public_profile_settings": "Public Profile Settings",
+        "witness_owner_is_too_long": "Witness owner username is too long",
+        "witness_description_is_too_long": "Witness description is too long",
         "preferences": "Preferences",
         "not_safe_for_work_nsfw_content": "Not safe for work (NSFW) content",
         "always_hide": "Always hide",
@@ -724,6 +726,8 @@
         "profile_about": "About",
         "profile_location": "Location",
         "profile_website": "Website",
+        "profile_witness_owner": "Witness owner",
+        "profile_witness_description": "Witness description",
         "saved": "Saved!",
         "choose_preferred_api_endpoint": "Choose Your Preferred API Node"
     },
diff --git a/src/app/redux/SagaShared.js b/src/app/redux/SagaShared.js
index 7c1c65c682..0dd78d8088 100644
--- a/src/app/redux/SagaShared.js
+++ b/src/app/redux/SagaShared.js
@@ -44,7 +44,17 @@ export function* getAccount(username, force = false) {
         );
 
         [account] = yield call([api, api.getAccountsAsync], [username]);
+        const accountWitness = yield call(
+            [api, api.callAsync],
+            'condenser_api.get_witness_by_account',
+            [username]
+        );
+
         if (account) {
+            if (accountWitness) {
+                account.account_is_witness = true;
+            }
+
             account = fromJS(account);
             yield put(globalActions.receiveAccount({ account }));
         }