diff --git a/app/Http/Requests/UpdateUserRequest.php b/app/Http/Requests/UpdateUserRequest.php
index 5673ac9..c4d5d54 100644
--- a/app/Http/Requests/UpdateUserRequest.php
+++ b/app/Http/Requests/UpdateUserRequest.php
@@ -15,7 +15,7 @@ class UpdateUserRequest extends FormRequest
     {
         $rules = [
             'username' => ['required', 'string', Rule::unique('users')->ignore($this->user)],
-            'name' => ['nullable', 'string'],
+            'name' => ['required', 'string'],
             'password' => ['nullable', 'string', 'confirmed'],
             'password_confirmation' => ['nullable', 'string'],
             'admin' => ['nullable', 'boolean'],
diff --git a/resources/views/profiles/edit.blade.php b/resources/views/profiles/edit.blade.php
index b90240b..fd1b683 100644
--- a/resources/views/profiles/edit.blade.php
+++ b/resources/views/profiles/edit.blade.php
@@ -8,53 +8,12 @@
         @csrf
         <div class="flex flex-col space-y-4">
             <div class="flex flex-col space-y-4 md:flex-row md:space-x-4 md:space-y-0">
-                <!-- Username -->
-                <div class="flex-auto">
-                    <x-inputs.label for="username" value="Username"/>
-
-                    <x-inputs.input name="username"
-                                    type="text"
-                                    class="block mt-1 w-full"
-                                    autocapitalize="none"
-                                    :value="old('username', $user->username)"
-                                    :hasError="$errors->has('username')"
-                                    required />
-                </div>
-
-                <!-- Name -->
-                <div class="flex-auto">
-                    <x-inputs.label for="name" value="Display name"/>
-
-                    <x-inputs.input name="name"
-                                    type="text"
-                                    class="block mt-1 w-full"
-                                    :value="old('name', $user->name)"/>
-                </div>
-
+                @include('users.partials.inputs.username')
+                @include('users.partials.inputs.name')
             </div>
 
             <div class="flex flex-col space-y-4 md:flex-row md:space-x-4 md:space-y-0">
-                <!-- Password -->
-                <div class="flex-auto">
-                    <x-inputs.label for="password" value="Password"/>
-
-                    <x-inputs.input name="password"
-                                    type="password"
-                                    class="block mt-1 w-full"
-                                    :hasError="$errors->has('password')"
-                                    :required="!$user->exists"/>
-                </div>
-
-                <!-- Password confirm -->
-                <div class="flex-auto">
-                    <x-inputs.label for="password_confirmation" value="Confirm Password"/>
-
-                    <x-inputs.input name="password_confirmation"
-                                    type="password"
-                                    class="block mt-1 w-full"
-                                    :hasError="$errors->has('password')"
-                                    :required="!$user->exists"/>
-                </div>
+                @include('users.partials.inputs.password')
             </div>
 
             <!-- Image -->
diff --git a/resources/views/profiles/show.blade.php b/resources/views/profiles/show.blade.php
index f2c2c80..4af01ee 100644
--- a/resources/views/profiles/show.blade.php
+++ b/resources/views/profiles/show.blade.php
@@ -17,8 +17,8 @@
                 {{ $user->getFirstMedia()('icon') }}
             </a>
         </div>
-        <div class="mt-2 text-gray-500">
-            {{ $user->name }}
-        </div>
     @endif
+    <div class="mt-2 text-gray-500">
+        {{ $user->name }}
+    </div>
 </x-app-layout>
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index b4d4a76..ee17f6f 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -9,65 +9,15 @@
         @csrf
         <div class="flex flex-col space-y-4">
             <div class="flex flex-col space-y-4 md:flex-row md:space-x-4 md:space-y-0">
-                <!-- Username -->
-                <div class="flex-auto space-y-1">
-                    <x-inputs.label for="username" value="Username"/>
-
-                    <x-inputs.input name="username"
-                                    type="text"
-                                    class="block w-full"
-                                    autocapitalize="none"
-                                    :value="old('username', $user->username)"
-                                    :hasError="$errors->has('username')"
-                                    required />
-                </div>
-
-                <!-- Name -->
-                <div class="flex-auto space-y-1">
-                    <x-inputs.label for="name" value="Display name"/>
-
-                    <x-inputs.input name="name"
-                                    type="text"
-                                    class="block w-full"
-                                    :value="old('name', $user->name)"/>
-                </div>
-
+                @include('users.partials.inputs.username')
+                @include('users.partials.inputs.name')
             </div>
 
             <div class="flex flex-col space-y-4 md:flex-row md:space-x-4 md:space-y-0">
-                <!-- Password -->
-                <div class="flex-auto space-y-1">
-                    <x-inputs.label for="password" value="Password"/>
-
-                    <x-inputs.input name="password"
-                                    type="password"
-                                    class="block w-full"
-                                    :hasError="$errors->has('password')"
-                                    :required="!$user->exists"/>
-                </div>
-
-                <!-- Password confirm -->
-                <div class="flex-auto space-y-1">
-                    <x-inputs.label for="password_confirmation" value="Confirm Password"/>
-
-                    <x-inputs.input name="password_confirmation"
-                                    type="password"
-                                    class="block w-full"
-                                    :hasError="$errors->has('password')"
-                                    :required="!$user->exists"/>
-                </div>
+                @include('users.partials.inputs.password')
             </div>
 
-            <!-- Admin -->
-            <div class="space-y-1">
-                <x-inputs.label for="admin" value="Site Admin" class="inline-block"/>
-
-                <x-inputs.select name="admin"
-                                 class="block"
-                                 :options="[['value' => 0, 'label' => 'No'], ['value' => 1, 'label' => 'Yes']]"
-                                 :selectedValue="old('admin', $user->admin)">
-                </x-inputs.select>
-            </div>
+            @include('users.partials.inputs.admin')
 
             <!-- Image -->
             <div class="flex flex-col space-y-4 md:flex-row md:space-x-4 md:space-y-0">
diff --git a/resources/views/users/partials/inputs/admin.blade.php b/resources/views/users/partials/inputs/admin.blade.php
new file mode 100644
index 0000000..4577b26
--- /dev/null
+++ b/resources/views/users/partials/inputs/admin.blade.php
@@ -0,0 +1,9 @@
+<div class="space-y-1">
+    <x-inputs.label for="admin" value="Site Admin" class="inline-block"/>
+
+    <x-inputs.select name="admin"
+                     class="block"
+                     :options="[['value' => 0, 'label' => 'No'], ['value' => 1, 'label' => 'Yes']]"
+                     :selectedValue="old('admin', $user->admin)">
+    </x-inputs.select>
+</div>
diff --git a/resources/views/users/partials/inputs/name.blade.php b/resources/views/users/partials/inputs/name.blade.php
new file mode 100644
index 0000000..51c6212
--- /dev/null
+++ b/resources/views/users/partials/inputs/name.blade.php
@@ -0,0 +1,10 @@
+<div class="flex-auto space-y-1">
+    <x-inputs.label for="name" value="Display name"/>
+
+    <x-inputs.input name="name"
+                    type="text"
+                    class="block w-full"
+                    :value="old('name', $user->name)"
+                    :hasError="$errors->has('name')"
+                    required />
+</div>
diff --git a/resources/views/users/partials/inputs/password.blade.php b/resources/views/users/partials/inputs/password.blade.php
new file mode 100644
index 0000000..f2f4809
--- /dev/null
+++ b/resources/views/users/partials/inputs/password.blade.php
@@ -0,0 +1,18 @@
+<div class="flex-auto space-y-1">
+    <x-inputs.label for="password" value="Password"/>
+
+    <x-inputs.input name="password"
+                    type="password"
+                    class="block w-full"
+                    :hasError="$errors->has('password')"
+                    :required="!$user->exists"/>
+</div>
+<div class="flex-auto space-y-1">
+    <x-inputs.label for="password_confirmation" value="Confirm Password"/>
+
+    <x-inputs.input name="password_confirmation"
+                    type="password"
+                    class="block w-full"
+                    :hasError="$errors->has('password')"
+                    :required="!$user->exists"/>
+</div>
diff --git a/resources/views/users/partials/inputs/username.blade.php b/resources/views/users/partials/inputs/username.blade.php
new file mode 100644
index 0000000..309abb1
--- /dev/null
+++ b/resources/views/users/partials/inputs/username.blade.php
@@ -0,0 +1,11 @@
+<div class="flex-auto space-y-1">
+    <x-inputs.label for="username" value="Username"/>
+
+    <x-inputs.input name="username"
+                    type="text"
+                    class="block w-full"
+                    autocapitalize="none"
+                    :value="old('username', $user->username)"
+                    :hasError="$errors->has('username')"
+                    required />
+</div>