diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
index dfc4b56..b4fc496 100644
--- a/public/locales/en/translation.json
+++ b/public/locales/en/translation.json
@@ -123,6 +123,9 @@
 
     "walletLabel": "Wallet label",
     "walletLabelPlaceholder": "Wallet label (optional)",
+    "walletLabelMaxLengthError": "No longer than 32 characters",
+    "walletLabelWhitespaceError": "Must not be only spaces",
+
     "walletCategory": "Wallet category",
     "walletCategoryDropdownNone": "No category",
     "walletCategoryDropdownNew": "New",
diff --git a/src/pages/wallets/AddWalletModal.tsx b/src/pages/wallets/AddWalletModal.tsx
index cd7ae0c..581856c 100644
--- a/src/pages/wallets/AddWalletModal.tsx
+++ b/src/pages/wallets/AddWalletModal.tsx
@@ -36,6 +36,7 @@
   const [form] = Form.useForm<FormValues>();
   const passwordInput = useRef<Input>(null);
   const [calculatedAddress, setCalculatedAddress] = useState<string | undefined>();
+  const [formatState, setFormatState] = useState<WalletFormatName>("kristwallet");
 
   async function onSubmit() {
     const values = await form.validateFields();
@@ -46,6 +47,8 @@
   }
 
   function onValuesChange(changed: Partial<FormValues>, values: Partial<FormValues>) {
+    if (changed.format) setFormatState(changed.format);
+
     if ((changed.format || changed.password) && values.password)
       updateCalculatedAddress(values.format, values.password);
   }
@@ -100,6 +103,10 @@
           <Form.Item
             name="label"
             label={t("addWallet.walletLabel")}
+            rules={[
+              { max: 32, message: t("addWallet.walletLabelMaxLengthError") },
+              { whitespace: true, message: t("addWallet.walletLabelWhitespaceError") }
+            ]}
           >
             <Input placeholder={t("addWallet.walletLabelPlaceholder")} />
           </Form.Item>
@@ -107,10 +114,7 @@
 
         {/* Wallet category */}
         <Col span={12}>
-          <Form.Item
-            name="category"
-            label={t("addWallet.walletCategory")}
-          >
+          <Form.Item name="category" label={t("addWallet.walletCategory")}>
             {getWalletCategoryDropdown({ onNewCategory: category => form.setFieldsValue({ category })})}
           </Form.Item>
         </Col>
@@ -121,7 +125,12 @@
       <FakeUsernameInput />
 
       {/* Wallet password */}
-      <Form.Item label={t("addWallet.walletPassword")} style={{ marginBottom: 0 }}>
+      <Form.Item
+        label={formatState === "api"
+          ? t("addWallet.walletPrivatekey")
+          : t("addWallet.walletPassword")}
+        style={{ marginBottom: 0 }}
+      >
         <Input.Group compact style={{ display: "flex" }}>
           <Form.Item name="password" style={{ flex: 1, marginBottom: 0 }}>
             <Input
@@ -133,7 +142,9 @@
               className={create ? "input-monospace" : ""}
               style={{ height: 32 }}
 
-              placeholder={t("addWallet.walletPasswordPlaceholder")}
+              placeholder={formatState === "api"
+                ? t("addWallet.walletPrivatekeyPlaceholder")
+                : t("addWallet.walletPasswordPlaceholder")}
             />
           </Form.Item>