diff --git a/src/lib/elements/forms/inputPhone.svelte b/src/lib/elements/forms/inputPhone.svelte
index d8a0665cc..dca033d6a 100644
--- a/src/lib/elements/forms/inputPhone.svelte
+++ b/src/lib/elements/forms/inputPhone.svelte
@@ -12,7 +12,7 @@
     export let autofocus = false;
     export let autocomplete = false;
     export let maxlength: number = null;
-    export let errorMessage = 'An error occurred';
+    export let errorMessage = 'Allowed characters: leading ‘+’ and maximum of 15 digits';
     export let errorType: false | 'success' | 'warning' | 'error' = 'warning';
     export let showHelper = false;
 
diff --git a/src/routes/console/[project]/users/user/[user]/index.svelte b/src/routes/console/[project]/users/user/[user]/index.svelte
index be7c115a3..2d685b872 100644
--- a/src/routes/console/[project]/users/user/[user]/index.svelte
+++ b/src/routes/console/[project]/users/user/[user]/index.svelte
@@ -263,28 +263,27 @@
                 {/if}
             </svelte:fragment>
         </CardGrid>
-        <CardGrid>
-            <h6 class="heading-level-7">Update Name</h6>
 
-            <svelte:fragment slot="aside">
-                <ul>
-                    <InputText
-                        id="name"
-                        label="Name"
-                        placeholder="Enter name"
-                        autocomplete={false}
-                        bind:value={userName} />
-                </ul>
-            </svelte:fragment>
+        <Form on:submit={updateName}>
+            <CardGrid>
+                <h6 class="heading-level-7">Update Name</h6>
 
-            <svelte:fragment slot="actions">
-                <Button
-                    disabled={userName === $user.name || !userName}
-                    on:click={() => {
-                        updateName();
-                    }}>Update</Button>
-            </svelte:fragment>
-        </CardGrid>
+                <svelte:fragment slot="aside">
+                    <ul>
+                        <InputText
+                            id="name"
+                            label="Name"
+                            placeholder="Enter name"
+                            autocomplete={false}
+                            bind:value={userName} />
+                    </ul>
+                </svelte:fragment>
+
+                <svelte:fragment slot="actions">
+                    <Button disabled={userName === $user.name || !userName} submit>Update</Button>
+                </svelte:fragment>
+            </CardGrid>
+        </Form>
 
         <Form on:submit={updateEmail}>
             <CardGrid>
@@ -307,126 +306,128 @@
             </CardGrid>
         </Form>
 
-        <CardGrid>
-            <h6 class="heading-level-7">Update Phone</h6>
-            <svelte:fragment slot="aside">
-                <ul>
-                    <InputPhone
-                        id="phone"
-                        label="Phone"
-                        placeholder="Enter phone number"
-                        autocomplete={false}
-                        bind:value={userPhone} />
-                </ul>
-            </svelte:fragment>
-
-            <svelte:fragment slot="actions">
-                <Button
-                    disabled={userPhone === $user.phone || !userPhone}
-                    on:click={() => {
-                        updatePhone();
-                    }}>Update</Button>
-            </svelte:fragment>
-        </CardGrid>
-        <CardGrid>
-            <div>
-                <h6 class="heading-level-7">Update Password</h6>
-            </div>
-
-            <p>
-                Enter a new password. A password must contain <b> at least 8 characters.</b>
-            </p>
-            <svelte:fragment slot="aside">
-                <ul>
-                    <InputPassword
-                        id="newPassword"
-                        label="New Password"
-                        placeholder="Enter new password"
-                        autocomplete={false}
-                        meter={false}
-                        showPasswordButton={true}
-                        bind:value={newPassword} />
-                </ul>
-            </svelte:fragment>
-
-            <svelte:fragment slot="actions">
-                <Button
-                    disabled={!newPassword}
-                    on:click={() => {
-                        updatePassword();
-                    }}>Update</Button>
-            </svelte:fragment>
-        </CardGrid>
-        <CardGrid>
-            <h6 class="heading-level-7">User Preferences</h6>
-            <p>
-                You can update your user preferences by storing information on the user's objects so
-                they can easily be shared across devices and sessions.
-            </p>
-            <svelte:fragment slot="aside">
-                <form class="form u-grid u-gap-16">
-                    <ul class="form-list">
-                        {#if prefs}
-                            {#each prefs as [key, value], index}
-                                <li class="form-item is-multiple">
-                                    <div class="form-item-part u-stretch">
-                                        <label class="label" for={`key-${index}`}>Key</label>
-                                        <div class="input-text-wrapper">
-                                            <input
-                                                id={`key-${key}`}
-                                                placeholder="Enter key"
-                                                type="text"
-                                                class="input-text"
-                                                bind:value={key} />
-                                        </div>
-                                    </div>
-                                    <div class="form-item-part u-stretch">
-                                        <label class="label" for={`value-${index}`}>Value</label>
-                                        <div class="input-text-wrapper">
-                                            <input
-                                                id={`value-${value}`}
-                                                placeholder="Enter value"
-                                                type="text"
-                                                class="input-text"
-                                                bind:value />
-                                        </div>
-                                    </div>
-                                    <div class="form-item-part u-cross-child-end">
-                                        <Button
-                                            text
-                                            disabled={(!key || !value) && index === 0}
-                                            on:click={() => {
-                                                if (index === 0) {
-                                                    prefs = [['', '']];
-                                                } else {
-                                                    prefs.splice(index, 1);
-                                                    prefs = prefs;
-                                                }
-                                            }}>
-                                            <span class="icon-x" aria-hidden="true" />
-                                        </Button>
-                                    </div>
-                                </li>
-                            {/each}
-                        {/if}
+        <Form on:submit={updatePhone}>
+            <CardGrid>
+                <h6 class="heading-level-7">Update Phone</h6>
+                <svelte:fragment slot="aside">
+                    <ul>
+                        <InputPhone
+                            id="phone"
+                            label="Phone"
+                            placeholder="Enter phone number"
+                            autocomplete={false}
+                            bind:value={userPhone} />
                     </ul>
-                    <Button
-                        text
-                        on:click={() => {
-                            if (prefs[prefs.length - 1][0] && prefs[prefs.length - 1][1]) {
-                                prefs.push(['', '']);
-                                prefs = prefs;
-                            }
-                        }}>
-                        <span class="icon-plus" aria-hidden="true" />
-                        <span class="text"> Add Preference </span></Button>
-                </form>
-            </svelte:fragment>
+                </svelte:fragment>
 
-            <svelte:fragment slot="actions">
-                <Button disabled={arePrefsDisabled} on:click={() => updatePrefs()}>Update</Button>
-            </svelte:fragment>
-        </CardGrid>
+                <svelte:fragment slot="actions">
+                    <Button disabled={userPhone === $user.phone || !userPhone} submit
+                        >Update</Button>
+                </svelte:fragment>
+            </CardGrid>
+        </Form>
+
+        <Form on:submit={updatePassword}>
+            <CardGrid>
+                <div>
+                    <h6 class="heading-level-7">Update Password</h6>
+                </div>
+
+                <p>
+                    Enter a new password. A password must contain <b> at least 8 characters.</b>
+                </p>
+                <svelte:fragment slot="aside">
+                    <ul>
+                        <InputPassword
+                            id="newPassword"
+                            label="New Password"
+                            placeholder="Enter new password"
+                            autocomplete={false}
+                            meter={false}
+                            showPasswordButton={true}
+                            bind:value={newPassword} />
+                    </ul>
+                </svelte:fragment>
+
+                <svelte:fragment slot="actions">
+                    <Button disabled={!newPassword} submit>Update</Button>
+                </svelte:fragment>
+            </CardGrid>
+        </Form>
+
+        <Form on:submit={updatePrefs}>
+            <CardGrid>
+                <h6 class="heading-level-7">User Preferences</h6>
+                <p>
+                    You can update your user preferences by storing information on the user's
+                    objects so they can easily be shared across devices and sessions.
+                </p>
+                <svelte:fragment slot="aside">
+                    <form class="form u-grid u-gap-16">
+                        <ul class="form-list">
+                            {#if prefs}
+                                {#each prefs as [key, value], index}
+                                    <li class="form-item is-multiple">
+                                        <div class="form-item-part u-stretch">
+                                            <label class="label" for={`key-${index}`}>Key</label>
+                                            <div class="input-text-wrapper">
+                                                <input
+                                                    id={`key-${key}`}
+                                                    placeholder="Enter key"
+                                                    type="text"
+                                                    class="input-text"
+                                                    bind:value={key} />
+                                            </div>
+                                        </div>
+                                        <div class="form-item-part u-stretch">
+                                            <label class="label" for={`value-${index}`}
+                                                >Value</label>
+                                            <div class="input-text-wrapper">
+                                                <input
+                                                    id={`value-${value}`}
+                                                    placeholder="Enter value"
+                                                    type="text"
+                                                    class="input-text"
+                                                    bind:value />
+                                            </div>
+                                        </div>
+                                        <div class="form-item-part u-cross-child-end">
+                                            <Button
+                                                text
+                                                disabled={(!key || !value) && index === 0}
+                                                on:click={() => {
+                                                    if (index === 0) {
+                                                        prefs = [['', '']];
+                                                    } else {
+                                                        prefs.splice(index, 1);
+                                                        prefs = prefs;
+                                                    }
+                                                }}>
+                                                <span class="icon-x" aria-hidden="true" />
+                                            </Button>
+                                        </div>
+                                    </li>
+                                {/each}
+                            {/if}
+                        </ul>
+                        <Button
+                            text
+                            on:click={() => {
+                                if (prefs[prefs.length - 1][0] && prefs[prefs.length - 1][1]) {
+                                    prefs.push(['', '']);
+                                    prefs = prefs;
+                                }
+                            }}>
+                            <span class="icon-plus" aria-hidden="true" />
+                            <span class="text"> Add Preference </span></Button>
+                    </form>
+                </svelte:fragment>
+
+                <svelte:fragment slot="actions">
+                    <Button disabled={arePrefsDisabled} submit>Update</Button>
+                </svelte:fragment>
+            </CardGrid>
+        </Form>
 
         <CardGrid>
             <div>