diff --git a/routes/web.php b/routes/web.php
index fda56e4955b..4a063c014b1 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -15,6 +15,8 @@
             Route::post('login', 'UserController@login')->name('login');
             Route::get('logout', 'UserController@logout')->name('logout');
             Route::post('register', 'UserController@register')->name('register');
+            Route::post('profile', 'UserController@profile')->name('profile');
+            Route::post('password', 'UserController@password')->name('password');
 
             Route::post('password/email', 'ForgotPasswordController@sendResetLinkEmail')->name('password.email');
             Route::get('password/reset/{token}', 'ResetPasswordController@showResetForm')->name('password.reset');
diff --git a/src/Auth/UserTags.php b/src/Auth/UserTags.php
index 0a78c7b0836..b718400e4c9 100644
--- a/src/Auth/UserTags.php
+++ b/src/Auth/UserTags.php
@@ -177,6 +177,86 @@ public function registerForm()
         return $html;
     }
 
+    /**
+     * Output a profile form.
+     *
+     * Maps to {{ user:profile_form }}
+     *
+     * @return string
+     */
+    public function profileForm()
+    {
+        if (session()->has('status')) {
+            return $this->parse(['success' => true]);
+        }
+
+        $data = $this->getFormSession('user.profile');
+
+        $data['fields'] = $this->getProfileFields();
+
+        $knownParams = ['redirect', 'error_redirect', 'allow_request_redirect'];
+
+        $html = $this->formOpen(route('statamic.profile'), 'POST', $knownParams);
+
+        $params = [];
+
+        if ($redirect = $this->getRedirectUrl()) {
+            $params['redirect'] = $this->parseRedirect($redirect);
+        }
+
+        if ($errorRedirect = $this->getErrorRedirectUrl()) {
+            $params['error_redirect'] = $this->parseRedirect($errorRedirect);
+        }
+
+        $html .= $this->formMetaFields($params);
+
+        $html .= $this->parse($data);
+
+        $html .= $this->formClose();
+
+        return $html;
+    }
+
+    /**
+     * Output a password change form.
+     *
+     * Maps to {{ user:password_form }}
+     *
+     * @return string
+     */
+    public function passwordForm()
+    {
+        if (session()->has('status')) {
+            return $this->parse(['success' => true]);
+        }
+
+        $data = $this->getFormSession('user.password');
+
+        $data['fields'] = $this->getPasswordFields();
+
+        $knownParams = ['redirect', 'error_redirect', 'allow_request_redirect'];
+
+        $html = $this->formOpen(route('statamic.password'), 'POST', $knownParams);
+
+        $params = [];
+
+        if ($redirect = $this->getRedirectUrl()) {
+            $params['redirect'] = $this->parseRedirect($redirect);
+        }
+
+        if ($errorRedirect = $this->getErrorRedirectUrl()) {
+            $params['error_redirect'] = $this->parseRedirect($errorRedirect);
+        }
+
+        $html .= $this->formMetaFields($params);
+
+        $html .= $this->parse($data);
+
+        $html .= $this->formClose();
+
+        return $html;
+    }
+
     /**
      * Alias of {{ user:register_form }}.
      *
@@ -562,4 +642,59 @@ protected function getAdditionalRegistrationFields()
             ->values()
             ->all();
     }
+
+    /**
+     * Get fields with extra data for looping over and rendering.
+     *
+     * @return array
+     */
+    protected function getProfileFields()
+    {
+        $user = User::current();
+
+        $values = $user
+            ? $user->data()->merge(['email' => $user->email()])->all()
+            : [];
+
+        return User::blueprint()->fields()->addValues($values)->preProcess()->all()
+            ->reject(function ($field) {
+                return in_array($field->handle(), ['password', 'password_confirmation', 'roles', 'groups'])
+                    || $field->fieldtype()->handle() === 'assets';
+            })
+            ->map(function ($field) {
+                return $this->getRenderableField($field, 'user.profile');
+            })
+            ->values()
+            ->all();
+    }
+
+    /**
+     * Get fields with extra data for looping over and rendering.
+     *
+     * @return array
+     */
+    protected function getPasswordFields()
+    {
+        return collect()
+            ->put('current_password', new Field('current_password', [
+                'type' => 'text',
+                'input_type' => 'password',
+                'display' => __('Current Password'),
+            ]))
+            ->put('password', new Field('password', [
+                'type' => 'text',
+                'input_type' => 'password',
+                'display' => __('Password'),
+            ]))
+            ->put('password_confirmation', new Field('password_confirmation', [
+                'type' => 'text',
+                'input_type' => 'password',
+                'display' => __('Password Confirmation'),
+            ]))
+            ->map(function ($field) {
+                return $this->getRenderableField($field, 'user.password');
+            })
+            ->values()
+            ->all();
+    }
 }
diff --git a/src/Http/Controllers/UserController.php b/src/Http/Controllers/UserController.php
index d98013953fe..3ae3d9356ca 100644
--- a/src/Http/Controllers/UserController.php
+++ b/src/Http/Controllers/UserController.php
@@ -11,6 +11,7 @@
 use Statamic\Events\UserRegistered;
 use Statamic\Events\UserRegistering;
 use Statamic\Exceptions\SilentFormFailureException;
+use Statamic\Exceptions\UnauthorizedHttpException;
 use Statamic\Facades\User;
 
 class UserController extends Controller
@@ -56,20 +57,24 @@ public function register(Request $request)
     {
         $blueprint = User::blueprint();
 
-        $fields = $blueprint->fields()->addValues($request->all());
+        $fields = $blueprint->fields();
+        $values = $this->valuesWithoutAssetFields($fields, $request);
+        $fields = $fields->addValues($values);
 
         $fieldRules = $fields->validator()->withRules([
             'email' => ['required', 'email', 'unique_user_value'],
             'password' => ['required', 'confirmed', PasswordDefaults::rules()],
         ])->rules();
 
-        $validator = Validator::make($request->all(), $fieldRules);
+        $validator = Validator::make($values, $fieldRules);
 
         if ($validator->fails()) {
             return $this->userRegistrationFailure($validator->errors());
         }
 
-        $values = $fields->process()->values()->except(['email', 'groups', 'roles']);
+        $values = $fields->process()->values()
+            ->only(array_keys($values))
+            ->except(['email', 'groups', 'roles', 'super']);
 
         $user = User::make()
             ->email($request->email)
@@ -101,6 +106,66 @@ public function register(Request $request)
         return $this->userRegistrationSuccess();
     }
 
+    public function profile(Request $request)
+    {
+        throw_unless($user = User::current(), new UnauthorizedHttpException(403));
+
+        $blueprint = User::blueprint();
+
+        $fields = $blueprint->fields();
+        $values = $this->valuesWithoutAssetFields($fields, $request);
+        $fields = $fields->addValues($values);
+
+        $fieldRules = $fields->validator()->withRules([
+            'email' => ['required', 'email', 'unique_user_value:'.$user->id()],
+        ])->rules();
+
+        $validator = Validator::make($values, $fieldRules);
+
+        if ($validator->fails()) {
+            return $this->userProfileFailure($validator->errors());
+        }
+
+        $values = $fields->process()->values()
+            ->only(array_keys($values))
+            ->except(['email', 'password', 'groups', 'roles', 'super']);
+
+        if ($request->email) {
+            $user->email($request->email);
+        }
+        foreach ($values as $key => $value) {
+            $user->set($key, $value);
+        }
+
+        $user->save();
+
+        session()->flash('user.profile.success', __('Update successful.'));
+
+        return $this->userProfileSuccess();
+    }
+
+    public function password(Request $request)
+    {
+        throw_unless($user = User::current(), new UnauthorizedHttpException(403));
+
+        $validator = Validator::make($request->all(), [
+            'current_password' => ['required', 'current_password'],
+            'password'         => ['required', 'confirmed', PasswordDefaults::rules()],
+        ]);
+
+        if ($validator->fails()) {
+            return $this->userPasswordFailure($validator->errors());
+        }
+
+        $user->password($request->password);
+
+        $user->save();
+
+        session()->flash('user.password.success', __('Change successful.'));
+
+        return $this->userPasswordSuccess();
+    }
+
     public function username()
     {
         return 'email';
@@ -122,4 +187,45 @@ private function userRegistrationSuccess(bool $silentFailure = false)
 
         return $response;
     }
+
+    private function userProfileFailure($errors = null)
+    {
+        $errorResponse = request()->has('_error_redirect') ? redirect(request()->input('_error_redirect')) : back();
+
+        return $errorResponse->withInput()->withErrors($errors, 'user.profile');
+    }
+
+    private function userProfileSuccess(bool $silentFailure = false)
+    {
+        $response = request()->has('_redirect') ? redirect(request()->get('_redirect')) : back();
+
+        session()->flash('user.profile.success', __('Update successful.'));
+
+        return $response;
+    }
+
+    private function userPasswordFailure($errors = null)
+    {
+        $errorResponse = request()->has('_error_redirect') ? redirect(request()->input('_error_redirect')) : back();
+
+        return $errorResponse->withInput()->withErrors($errors, 'user.password');
+    }
+
+    private function userPasswordSuccess(bool $silentFailure = false)
+    {
+        $response = request()->has('_redirect') ? redirect(request()->get('_redirect')) : back();
+
+        session()->flash('user.password.success', __('Change successful.'));
+
+        return $response;
+    }
+
+    private function valuesWithoutAssetFields($fields, $request)
+    {
+        $assets = $fields->all()
+            ->filter(fn ($field) => $field->fieldtype()->handle() === 'assets')
+            ->keys()->all();
+
+        return $request->except($assets);
+    }
 }
diff --git a/src/Tags/Concerns/RendersForms.php b/src/Tags/Concerns/RendersForms.php
index 345191628d5..bdf16472952 100644
--- a/src/Tags/Concerns/RendersForms.php
+++ b/src/Tags/Concerns/RendersForms.php
@@ -134,6 +134,7 @@ protected function getRenderableField($field, $errorBag = 'default', $manipulate
 
         $data = array_merge($field->toArray(), [
             'error' => $errors->first($field->handle()) ?: null,
+            'default' => $field->value() ?? $field->defaultValue(),
             'old' => old($field->handle()),
             'value' => $value,
         ]);
diff --git a/tests/Tags/User/PasswordFormTest.php b/tests/Tags/User/PasswordFormTest.php
new file mode 100644
index 00000000000..94074785fee
--- /dev/null
+++ b/tests/Tags/User/PasswordFormTest.php
@@ -0,0 +1,294 @@
+<?php
+
+namespace Tests\Tags\User;
+
+use Statamic\Facades\Parse;
+use Statamic\Facades\User;
+use Tests\NormalizesHtml;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class PasswordFormTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk, NormalizesHtml;
+
+    private function tag($tag)
+    {
+        return Parse::template($tag, []);
+    }
+
+    /** @test */
+    public function it_renders_form()
+    {
+        $this->actingAs(User::make()->password('mypassword')->save());
+
+        $output = $this->tag('{{ user:password_form }}{{ /user:password_form }}');
+
+        $this->assertStringStartsWith('<form method="POST" action="http://localhost/!/auth/password">', $output);
+        $this->assertStringContainsString('<input type="hidden" name="_token" value="">', $output);
+        $this->assertStringEndsWith('</form>', $output);
+    }
+
+    /** @test */
+    public function it_renders_form_with_params()
+    {
+        $this->actingAs(User::make()->password('mypassword')->save());
+
+        $output = $this->tag('{{ user:password_form redirect="/submitted" error_redirect="/errors" class="form" id="form" }}{{ /user:password_form }}');
+
+        $this->assertStringStartsWith('<form method="POST" action="http://localhost/!/auth/password" class="form" id="form">', $output);
+        $this->assertStringContainsString('<input type="hidden" name="_redirect" value="/submitted" />', $output);
+        $this->assertStringContainsString('<input type="hidden" name="_error_redirect" value="/errors" />', $output);
+    }
+
+    /** @test */
+    public function it_renders_form_with_redirects_to_anchor()
+    {
+        $this->actingAs(User::make()->password('mypassword')->save());
+
+        $output = $this->tag('{{ user:password_form redirect="#form" error_redirect="#form" }}{{ /user:password_form }}');
+
+        $this->assertStringContainsString('<input type="hidden" name="_redirect" value="http://localhost#form" />', $output);
+        $this->assertStringContainsString('<input type="hidden" name="_error_redirect" value="http://localhost#form" />', $output);
+    }
+
+    /** @test */
+    public function it_renders_form_with_fields_array()
+    {
+        $this->actingAs(User::make()
+            ->email('test@example.com')
+            ->data(['name' => 'Test User'])
+            ->save());
+
+        $output = $this->normalizeHtml($this->tag(<<<'EOT'
+{{ user:password_form }}
+    {{ fields }}
+        <label>{{ display }}</label>{{ field }}
+    {{ /fields }}
+{{ /user:password_form }}
+EOT
+));
+
+        preg_match_all('/<label>.+<\/label><input.+>/U', $output, $actual);
+
+        $expected = [
+            '<label>Current Password</label><input type="password" name="current_password" value="">',
+            '<label>Password</label><input type="password" name="password" value="">',
+            '<label>Password Confirmation</label><input type="password" name="password_confirmation" value="">',
+        ];
+
+        $this->assertEquals($expected, $actual[0]);
+    }
+
+    /** @test */
+    public function it_wont_update_password_and_renders_errors()
+    {
+        $this->actingAs(User::make()->password('mypassword')->save());
+
+        $this
+            ->post('/!/auth/password', [
+                'current_password' => '',
+                'password' => '',
+                'password_confirmation' => '',
+            ])
+            ->assertSessionHasErrors([
+                'current_password',
+                'password',
+            ], null, 'user.password');
+
+        $output = $this->tag(<<<'EOT'
+{{ user:password_form }}
+    <p class="success">{{ success }}</p>
+    {{ errors }}
+        <p class="error">{{ value }}</p>
+    {{ /errors }}
+    {{ fields }}
+        <p class="inline-error">{{ error }}</p>
+    {{ /fields }}
+{{ /user:password_form }}
+EOT
+        );
+
+        preg_match_all('/<p class="success">(.+)<\/p>/U', $output, $success);
+        preg_match_all('/<p class="error">(.+)<\/p>/U', $output, $errors);
+        preg_match_all('/<p class="inline-error">(.+)<\/p>/U', $output, $inlineErrors);
+
+        $expected = [
+            'The current password field is required.',
+            'The password field is required.',
+        ];
+
+        $this->assertEmpty($success[1]);
+        $this->assertEquals($expected, $errors[1]);
+        $this->assertEquals($expected, $inlineErrors[1]);
+    }
+
+    /** @test */
+    public function it_wont_update_password_and_renders_errors_with_incorrect_password()
+    {
+        $this->actingAs(User::make()->password('mypassword')->save());
+
+        $this
+            ->post('/!/auth/password', [
+                'current_password' => 'wrongpassword',
+                'password' => 'newpassword',
+                'password_confirmation' => 'newpassword',
+            ])
+            ->assertSessionHasErrors([
+                'current_password',
+            ], null, 'user.password');
+
+        $output = $this->tag(<<<'EOT'
+{{ user:password_form }}
+    <p class="success">{{ success }}</p>
+    {{ errors }}
+        <p class="error">{{ value }}</p>
+    {{ /errors }}
+    {{ fields }}
+        <p class="inline-error">{{ error }}</p>
+    {{ /fields }}
+{{ /user:password_form }}
+EOT
+        );
+
+        preg_match_all('/<p class="success">(.+)<\/p>/U', $output, $success);
+        preg_match_all('/<p class="error">(.+)<\/p>/U', $output, $errors);
+        preg_match_all('/<p class="inline-error">(.+)<\/p>/U', $output, $inlineErrors);
+
+        $expected = [[
+            'validation.current_password',
+        ], [
+            'The password is incorrect.',
+        ]];
+
+        $this->assertEmpty($success[1]);
+        $this->assertContains($errors[1], $expected);
+        $this->assertContains($inlineErrors[1], $expected);
+    }
+
+    /** @test */
+    public function it_will_update_password_and_render_success()
+    {
+        $this->actingAs(User::make()->password('mypassword')->save());
+
+        $this
+            ->post('/!/auth/password', [
+                'current_password' => 'mypassword',
+                'password' => 'newpassword',
+                'password_confirmation' => 'newpassword',
+            ])
+            ->assertSessionHasNoErrors();
+
+        $output = $this->tag(<<<'EOT'
+{{ user:password_form }}
+    <p class="success">{{ success }}</p>
+    {{ errors }}
+        <p class="error">{{ value }}</p>
+    {{ /errors }}
+    {{ fields }}
+        <p class="inline-error">{{ error }}</p>
+    {{ /fields }}
+{{ /user:password_form }}
+EOT
+        );
+
+        preg_match_all('/<p class="success">(.+)<\/p>/U', $output, $success);
+        preg_match_all('/<p class="error">(.+)<\/p>/U', $output, $errors);
+        preg_match_all('/<p class="inline-error">(.+)<\/p>/U', $output, $inlineErrors);
+
+        $this->assertEquals(['Change successful.'], $success[1]);
+        $this->assertEmpty($errors[1]);
+        $this->assertEmpty($inlineErrors[1]);
+    }
+
+    /** @test */
+    public function it_will_update_password_and_follow_custom_redirect_with_success()
+    {
+        $this->actingAs(User::make()->password('mypassword')->save());
+
+        $this
+            ->post('/!/auth/password', [
+                'current_password' => 'mypassword',
+                'password' => 'newpassword',
+                'password_confirmation' => 'newpassword',
+                '_redirect' => '/password-successful',
+            ])
+            ->assertSessionHasNoErrors()
+            ->assertLocation('/password-successful');
+
+        $output = $this->tag(<<<'EOT'
+{{ user:password_form }}
+    <p class="success">{{ success }}</p>
+{{ /user:password_form }}
+EOT
+        );
+
+        preg_match_all('/<p class="success">(.+)<\/p>/U', $output, $success);
+
+        $this->assertEquals(['Change successful.'], $success[1]);
+    }
+
+    /** @test */
+    public function it_wont_update_password_and_follow_custom_redirect_with_errors()
+    {
+        $this->actingAs(User::make()->password('mypassword')->save());
+
+        $this
+            ->post('/!/auth/password', [
+                'current_password' => 'wrongpassword',
+                'password' => 'newpassword',
+                'password_confirmation' => 'newpassword',
+                '_error_redirect' => '/password-error',
+            ])
+            ->assertSessionHasErrors([
+                'current_password',
+            ], null, 'user.password')
+            ->assertLocation('/password-error');
+
+        $output = $this->tag(<<<'EOT'
+{{ user:password_form }}
+    <p class="success">{{ success }}</p>
+    {{ errors }}
+        <p class="error">{{ value }}</p>
+    {{ /errors }}
+    {{ fields }}
+        <p class="inline-error">{{ error }}</p>
+    {{ /fields }}
+{{ /user:password_form }}
+EOT
+        );
+
+        preg_match_all('/<p class="success">(.+)<\/p>/U', $output, $success);
+        preg_match_all('/<p class="error">(.+)<\/p>/U', $output, $errors);
+        preg_match_all('/<p class="inline-error">(.+)<\/p>/U', $output, $inlineErrors);
+
+        $expected = [[
+            'validation.current_password',
+        ], [
+            'The password is incorrect.',
+        ]];
+
+        $this->assertEmpty($success[1]);
+        $this->assertContains($errors[1], $expected);
+        $this->assertContains($inlineErrors[1], $expected);
+    }
+
+    /** @test */
+    public function it_will_use_redirect_query_param_off_url()
+    {
+        $this->get('/?redirect=password-successful&error_redirect=registration-failure');
+
+        $expectedRedirect = '<input type="hidden" name="_redirect" value="password-successful" />';
+        $expectedErrorRedirect = '<input type="hidden" name="_error_redirect" value="registration-failure" />';
+
+        $output = $this->tag('{{ user:password_form }}{{ /user:password_form }}');
+
+        $this->assertStringNotContainsString($expectedRedirect, $output);
+        $this->assertStringNotContainsString($expectedErrorRedirect, $output);
+
+        $output = $this->tag('{{ user:password_form allow_request_redirect="true" }}{{ /user:password_form }}');
+
+        $this->assertStringContainsString($expectedRedirect, $output);
+        $this->assertStringContainsString($expectedErrorRedirect, $output);
+    }
+}
diff --git a/tests/Tags/User/ProfileFormTest.php b/tests/Tags/User/ProfileFormTest.php
new file mode 100644
index 00000000000..0d74e30631f
--- /dev/null
+++ b/tests/Tags/User/ProfileFormTest.php
@@ -0,0 +1,311 @@
+<?php
+
+namespace Tests\Tags\User;
+
+use Statamic\Facades\Blueprint;
+use Statamic\Facades\Parse;
+use Statamic\Facades\User;
+use Tests\NormalizesHtml;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class ProfileFormTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk, NormalizesHtml;
+
+    private function tag($tag)
+    {
+        return Parse::template($tag, []);
+    }
+
+    /** @test */
+    public function it_renders_form()
+    {
+        $this->actingAs(User::make()->save());
+
+        $output = $this->tag('{{ user:profile_form }}{{ /user:profile_form }}');
+
+        $this->assertStringStartsWith('<form method="POST" action="http://localhost/!/auth/profile">', $output);
+        $this->assertStringContainsString('<input type="hidden" name="_token" value="">', $output);
+        $this->assertStringEndsWith('</form>', $output);
+    }
+
+    /** @test */
+    public function it_renders_form_with_params()
+    {
+        $this->actingAs(User::make()->save());
+
+        $output = $this->tag('{{ user:profile_form redirect="/submitted" error_redirect="/errors" class="form" id="form" }}{{ /user:profile_form }}');
+
+        $this->assertStringStartsWith('<form method="POST" action="http://localhost/!/auth/profile" class="form" id="form">', $output);
+        $this->assertStringContainsString('<input type="hidden" name="_redirect" value="/submitted" />', $output);
+        $this->assertStringContainsString('<input type="hidden" name="_error_redirect" value="/errors" />', $output);
+    }
+
+    /** @test */
+    public function it_renders_form_with_redirects_to_anchor()
+    {
+        $this->actingAs(User::make()->save());
+
+        $output = $this->tag('{{ user:profile_form redirect="#form" error_redirect="#form" }}{{ /user:profile_form }}');
+
+        $this->assertStringContainsString('<input type="hidden" name="_redirect" value="http://localhost#form" />', $output);
+        $this->assertStringContainsString('<input type="hidden" name="_error_redirect" value="http://localhost#form" />', $output);
+    }
+
+    /** @test */
+    public function it_renders_form_with_fields_array()
+    {
+        $this->actingAs(User::make()
+            ->email('test@example.com')
+            ->data(['name' => 'Test User'])
+            ->save());
+
+        $output = $this->normalizeHtml($this->tag(<<<'EOT'
+{{ user:profile_form }}
+    {{ fields }}
+        <label>{{ display }}</label>{{ field }}
+    {{ /fields }}
+{{ /user:profile_form }}
+EOT
+));
+
+        preg_match_all('/<label>.+<\/label><input.+>/U', $output, $actual);
+
+        $expected = [
+            '<label>Email Address</label><input type="email" name="email" value="test@example.com">',
+            '<label>Name</label><input type="text" name="name" value="Test User">',
+        ];
+
+        $this->assertEquals($expected, $actual[0]);
+    }
+
+    /** @test */
+    public function it_renders_form_with_fields_array_and_custom_blueprint()
+    {
+        $this->actingAs(User::make()
+            ->email('test@example.com')
+            ->data(['name' => 'Test User', 'phone' => '12345'])
+            ->save());
+        $this->useCustomBlueprint();
+
+        $output = $this->normalizeHtml($this->tag(<<<'EOT'
+{{ user:profile_form }}
+    {{ fields }}
+        <label>{{ display }}</label>{{ field }}
+    {{ /fields }}
+{{ /user:profile_form }}
+EOT
+));
+
+        preg_match_all('/<label>.+<\/label><input.+>/U', $output, $actual);
+
+        $expected = [
+            '<label>Full Name</label><input type="text" name="name" value="Test User">',
+            '<label>Phone Number</label><input type="text" name="phone" value="12345">',
+            '<label>Over 18 years of age?</label><input type="text" name="age" value="" required>',
+        ];
+
+        $this->assertEquals($expected, $actual[0]);
+    }
+
+    /** @test */
+    public function it_wont_update_user_and_renders_errors()
+    {
+        $this->actingAs(User::make()->save());
+
+        $this
+            ->post('/!/auth/profile', [
+                'email' => '',
+            ])
+            ->assertSessionHasErrors([
+                'email',
+            ], null, 'user.profile');
+
+        $output = $this->tag(<<<'EOT'
+{{ user:profile_form }}
+    <p class="success">{{ success }}</p>
+    {{ errors }}
+        <p class="error">{{ value }}</p>
+    {{ /errors }}
+    {{ fields }}
+        <p class="inline-error">{{ error }}</p>
+    {{ /fields }}
+{{ /user:profile_form }}
+EOT
+        );
+
+        preg_match_all('/<p class="success">(.+)<\/p>/U', $output, $success);
+        preg_match_all('/<p class="error">(.+)<\/p>/U', $output, $errors);
+        preg_match_all('/<p class="inline-error">(.+)<\/p>/U', $output, $inlineErrors);
+
+        $expected = [
+            'The email field is required.',
+        ];
+
+        $this->assertEmpty($success[1]);
+        $this->assertEquals($expected, $errors[1]);
+        $this->assertEquals($expected, $inlineErrors[1]);
+    }
+
+    /** @test */
+    public function it_will_update_user_and_render_success()
+    {
+        $this->actingAs(User::make()->save());
+
+        $this
+            ->post('/!/auth/profile', [
+                'email' => 'san@holo.com',
+            ])
+            ->assertSessionHasNoErrors();
+
+        $output = $this->tag(<<<'EOT'
+{{ user:profile_form }}
+    <p class="success">{{ success }}</p>
+    {{ errors }}
+        <p class="error">{{ value }}</p>
+    {{ /errors }}
+    {{ fields }}
+        <p class="inline-error">{{ error }}</p>
+    {{ /fields }}
+{{ /user:profile_form }}
+EOT
+        );
+
+        preg_match_all('/<p class="success">(.+)<\/p>/U', $output, $success);
+        preg_match_all('/<p class="error">(.+)<\/p>/U', $output, $errors);
+        preg_match_all('/<p class="inline-error">(.+)<\/p>/U', $output, $inlineErrors);
+
+        $this->assertEquals(['Update successful.'], $success[1]);
+        $this->assertEmpty($errors[1]);
+        $this->assertEmpty($inlineErrors[1]);
+    }
+
+    /** @test */
+    public function it_will_update_user_and_follow_custom_redirect_with_success()
+    {
+        $this->actingAs(User::make()->save());
+
+        $this
+            ->post('/!/auth/profile', [
+                'email' => 'san@holo.com',
+                '_redirect' => '/profile-successful',
+            ])
+            ->assertSessionHasNoErrors()
+            ->assertLocation('/profile-successful');
+
+        $output = $this->tag(<<<'EOT'
+{{ user:profile_form }}
+    <p class="success">{{ success }}</p>
+{{ /user:profile_form }}
+EOT
+        );
+
+        preg_match_all('/<p class="success">(.+)<\/p>/U', $output, $success);
+
+        $this->assertEquals(['Update successful.'], $success[1]);
+    }
+
+    /** @test */
+    public function it_wont_update_user_and_follow_custom_redirect_with_errors()
+    {
+        $this->actingAs(User::make()->save());
+
+        $this
+            ->post('/!/auth/profile', [
+                'email' => '',
+                '_error_redirect' => '/profile-error',
+            ])
+            ->assertSessionHasErrors([
+                'email',
+            ], null, 'user.profile')
+            ->assertLocation('/profile-error');
+
+        $output = $this->tag(<<<'EOT'
+{{ user:profile_form }}
+    <p class="success">{{ success }}</p>
+    {{ errors }}
+        <p class="error">{{ value }}</p>
+    {{ /errors }}
+    {{ fields }}
+        <p class="inline-error">{{ error }}</p>
+    {{ /fields }}
+{{ /user:profile_form }}
+EOT
+        );
+
+        preg_match_all('/<p class="success">(.+)<\/p>/U', $output, $success);
+        preg_match_all('/<p class="error">(.+)<\/p>/U', $output, $errors);
+        preg_match_all('/<p class="inline-error">(.+)<\/p>/U', $output, $inlineErrors);
+
+        $expected = [
+            'The email field is required.',
+        ];
+
+        $this->assertEmpty($success[1]);
+        $this->assertEquals($expected, $errors[1]);
+        $this->assertEquals($expected, $inlineErrors[1]);
+    }
+
+    /** @test */
+    public function it_will_use_redirect_query_param_off_url()
+    {
+        $this->get('/?redirect=profile-successful&error_redirect=registration-failure');
+
+        $expectedRedirect = '<input type="hidden" name="_redirect" value="profile-successful" />';
+        $expectedErrorRedirect = '<input type="hidden" name="_error_redirect" value="registration-failure" />';
+
+        $output = $this->tag('{{ user:profile_form }}{{ /user:profile_form }}');
+
+        $this->assertStringNotContainsString($expectedRedirect, $output);
+        $this->assertStringNotContainsString($expectedErrorRedirect, $output);
+
+        $output = $this->tag('{{ user:profile_form allow_request_redirect="true" }}{{ /user:profile_form }}');
+
+        $this->assertStringContainsString($expectedRedirect, $output);
+        $this->assertStringContainsString($expectedErrorRedirect, $output);
+    }
+
+    private function useCustomBlueprint()
+    {
+        $blueprint = Blueprint::make()->setContents([
+            'fields' => [
+                [
+                    'handle' => 'name', // Field already exists, but we're defining custom display string.
+                    'field' => [
+                        'type' => 'text',
+                        'display' => 'Full Name',
+                    ],
+                ],
+                [
+                    'handle' => 'password', // Field already exists, but we're defining custom validation rules.
+                    'field' => [
+                        'type' => 'text',
+                        'input_type' => 'password',
+                        'display' => 'Password',
+                        'validate' => 'min:8',
+                    ],
+                ],
+                [
+                    'handle' => 'phone', // Adding custom phone field.
+                    'field' => [
+                        'type' => 'text',
+                        'display' => 'Phone Number',
+                    ],
+                ],
+                [
+                    'handle' => 'age', // Adding custom age field.
+                    'field' => [
+                        'type' => 'text',
+                        'display' => 'Over 18 years of age?',
+                        'validate' => 'required',
+                    ],
+                ],
+            ],
+        ]);
+
+        Blueprint::shouldReceive('find')
+            ->with('user')
+            ->andReturn($blueprint);
+    }
+}