diff --git a/packages/pl-api/lib/entities/account.ts b/packages/pl-api/lib/entities/account.ts
index 9b91db11e..3326b2208 100644
--- a/packages/pl-api/lib/entities/account.ts
+++ b/packages/pl-api/lib/entities/account.ts
@@ -150,8 +150,10 @@ const baseAccountSchema = v.object({
   local: v.fallback(v.optional(v.boolean()), false),
 
   avatar_description: v.fallback(v.string(), ''),
+  custom_css: v.fallback(v.string(), ''),
   enable_rss: v.fallback(v.boolean(), false),
   header_description: v.fallback(v.string(), ''),
+  hide_collections: v.fallback(v.optional(v.boolean()), undefined),
 
   verified: v.fallback(v.optional(v.boolean()), undefined),
   domain: v.fallback(v.string(), ''),
@@ -235,6 +237,11 @@ const untypedCredentialAccountSchema = v.pipe(v.any(), preprocessAccount, v.obje
     discoverable: v.fallback(v.optional(v.boolean()), undefined),
     actor_type: v.fallback(v.optional(v.string()), undefined),
     show_birthday: v.fallback(v.optional(v.boolean()), undefined),
+
+    also_known_as_uris: v.fallback(v.optional(v.array(v.string())), undefined),
+    status_content_type: v.fallback(v.optional(v.string()), undefined),
+    web_layout: v.fallback(v.optional(v.picklist(['microblog', 'gallery'])), undefined),
+    web_visibility: v.fallback(v.optional(v.picklist(['public', 'unlisted', 'none'])), undefined),
   })), null),
   role: v.fallback(v.nullable(roleSchema), null),
 
diff --git a/packages/pl-api/package.json b/packages/pl-api/package.json
index 35e667721..cbd8efc66 100644
--- a/packages/pl-api/package.json
+++ b/packages/pl-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pl-api",
-  "version": "1.0.0-rc.56",
+  "version": "1.0.0-rc.57",
   "type": "module",
   "homepage": "https://github.com/mkljczk/pl-fe/tree/develop/packages/pl-api",
   "repository": {
diff --git a/packages/pl-fe/package.json b/packages/pl-fe/package.json
index 61fb2680d..cbc3d6935 100644
--- a/packages/pl-fe/package.json
+++ b/packages/pl-fe/package.json
@@ -104,7 +104,7 @@
     "multiselect-react-dropdown": "^2.0.25",
     "mutative": "^1.1.0",
     "path-browserify": "^1.0.1",
-    "pl-api": "^1.0.0-rc.56",
+    "pl-api": "^1.0.0-rc.57",
     "postcss": "^8.5.3",
     "process": "^0.11.10",
     "punycode": "^2.1.1",
diff --git a/packages/pl-fe/src/features/edit-profile/index.tsx b/packages/pl-fe/src/features/edit-profile/index.tsx
index 14b19f960..a9a5f8c3c 100644
--- a/packages/pl-fe/src/features/edit-profile/index.tsx
+++ b/packages/pl-fe/src/features/edit-profile/index.tsx
@@ -1,5 +1,5 @@
 import pick from 'lodash/pick';
-import { GOTOSOCIAL } from 'pl-api';
+import { type CredentialAccount, GOTOSOCIAL } from 'pl-api';
 import React, { useState, useEffect } from 'react';
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
@@ -21,6 +21,7 @@ import Toggle from 'pl-fe/components/ui/toggle';
 import { useImageField } from 'pl-fe/hooks/forms/use-image-field';
 import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch';
 import { useAppSelector } from 'pl-fe/hooks/use-app-selector';
+import { useClient } from 'pl-fe/hooks/use-client';
 import { useFeatures } from 'pl-fe/hooks/use-features';
 import { useInstance } from 'pl-fe/hooks/use-instance';
 import { useOwnAccount } from 'pl-fe/hooks/use-own-account';
@@ -33,7 +34,6 @@ import AvatarPicker from './components/avatar-picker';
 import HeaderPicker from './components/header-picker';
 
 import type { StreamfieldComponent } from 'pl-fe/components/ui/streamfield';
-import type { Account } from 'pl-fe/normalizers/account';
 
 const nonDefaultAvatar = (url: string | undefined) => url && isDefaultAvatar(url) ? undefined : url;
 const nonDefaultHeader = (url: string | undefined) => url && isDefaultHeader(url) ? undefined : url;
@@ -42,7 +42,7 @@ const nonDefaultHeader = (url: string | undefined) => url && isDefaultHeader(url
  * Whether the user is hiding their follows and/or followers.
  * Pleroma's config is granular, but we simplify it into one setting.
  */
-const hidesNetwork = ({ __meta }: Account): boolean => Boolean(
+const hidesNetwork = ({ __meta }: Pick<CredentialAccount, '__meta'>): boolean => Boolean(
   __meta.pleroma?.hide_followers && __meta.pleroma?.hide_follows && __meta.pleroma?.hide_followers_count && __meta.pleroma?.hide_follows_count,
 );
 
@@ -147,19 +147,18 @@ interface AccountCredentials {
 }
 
 /** Convert an account into an update_credentials request object. */
-const accountToCredentials = (account: Account): AccountCredentials => {
+const accountToCredentials = (account: CredentialAccount): AccountCredentials => {
   const hideNetwork = hidesNetwork(account);
 
   return {
-    ...(pick(account, ['discoverable', 'bot', 'display_name', 'locked', 'location', 'avatar_description', 'header_description', 'enable_rss', 'hide_collections', 'is_cat', 'speak_as_cat', 'mention_policy', 'web_visibility', 'web_layout'])),
-    note: account.__meta.source?.note ?? '',
+    ...(pick(account, ['birthday', 'bot', 'custom_css', 'display_name', 'locked', 'location', 'avatar_description', 'header_description', 'enable_rss', 'hide_collections', 'is_cat', 'speak_as_cat', 'mention_policy'])),
+    ...(pick(account.source, ['discoverable', 'note', 'web_layout', 'web_visibility'])),
     fields_attributes: [...account.__meta.source?.fields ?? []],
     stranger_notifications: account.__meta.pleroma?.notification_settings?.block_from_strangers === true,
     hide_followers: hideNetwork,
     hide_follows: hideNetwork,
     hide_followers_count: hideNetwork,
     hide_follows_count: hideNetwork,
-    birthday: account.birthday ?? undefined,
   };
 };
 
@@ -195,6 +194,7 @@ const EditProfile: React.FC = () => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
   const instance = useInstance();
+  const client = useClient();
 
   const { account } = useOwnAccount();
   const features = useFeatures();
@@ -207,7 +207,7 @@ const EditProfile: React.FC = () => {
     ?.filter(type => type.startsWith('image/'))
     .join(',');
 
-  const [isLoading, setLoading] = useState(false);
+  const [isLoading, setLoading] = useState(true);
   const [data, setData] = useState<AccountCredentials>({});
   const [muteStrangers, setMuteStrangers] = useState(false);
   const [customCSSEditorExpanded, setCustomCSSEditorExpanded] = useState(false);
@@ -216,12 +216,15 @@ const EditProfile: React.FC = () => {
   const header = useImageField({ maxPixels: 1920 * 1080, preview: nonDefaultHeader(account?.header) });
 
   useEffect(() => {
-    if (account) {
-      const credentials = accountToCredentials(account);
-      const strangerNotifications = account.__meta.pleroma?.notification_settings?.block_from_strangers === true;
+    client.settings.verifyCredentials().then((credentialAccount) => {
+      const credentials = accountToCredentials(credentialAccount);
+      const strangerNotifications = credentialAccount.__meta.pleroma?.notification_settings?.block_from_strangers === true;
       setData(credentials);
       setMuteStrangers(strangerNotifications);
-    }
+      setLoading(false);
+    }).catch(() => {
+      setLoading(false);
+    });
   }, [account?.id]);
 
   /** Set a single key in the request data. */
diff --git a/packages/pl-fe/yarn.lock b/packages/pl-fe/yarn.lock
index 0a6708bfb..0902756e2 100644
--- a/packages/pl-fe/yarn.lock
+++ b/packages/pl-fe/yarn.lock
@@ -6858,10 +6858,10 @@ pkg-dir@^4.1.0:
   dependencies:
     find-up "^4.0.0"
 
-pl-api@^1.0.0-rc.56:
-  version "1.0.0-rc.56"
-  resolved "https://registry.yarnpkg.com/pl-api/-/pl-api-1.0.0-rc.56.tgz#e88c57290cda0d592e05832c4a1424a5ec50dad3"
-  integrity sha512-Ia1row2Pgdwx+xBdAMrdxMeotd13CsCSb1BobFFnuJMbqQDP1cvj5LJRFlNVd/ijz36ZLzIpftomL2skRkLA6A==
+pl-api@^1.0.0-rc.57:
+  version "1.0.0-rc.57"
+  resolved "https://registry.yarnpkg.com/pl-api/-/pl-api-1.0.0-rc.57.tgz#848259e4a38e3c44dc3048a86578d877b36e50e7"
+  integrity sha512-ndT9fnL0LJt5EMRMHWRovAd/YE8w6Ya/Ow1TUbiwM760IqQUAIyxBNt5gLB89OlkbJQiVC+RD/vVUxBdBMisLg==
   dependencies:
     blurhash "^2.0.5"
     http-link-header "^1.1.3"