diff --git a/src/Views/user-delete.phtml b/src/Views/user-delete.phtml
new file mode 100644
index 00000000..516277dd
--- /dev/null
+++ b/src/Views/user-delete.phtml
@@ -0,0 +1,21 @@
+<form action="<?php echo \Chibi\UrlHelper::route('user', 'delete', ['name' => $this->context->transport->user->name]) ?>" method="post" class="edit aligned" autocomplete="off" data-confirm-text="Are you sure you want to delete your account?">
+	<?php if ($this->context->user->id == $this->context->transport->user->id): ?>
+		<div class="current-password">
+			<label class="left" for="current-password">Current password:</label>
+			<div class="input-wrapper"><input type="password" name="current-password" id="current-password" placeholder="Current password"/></div>
+		</div>
+	<?php endif ?>
+
+	<input type="hidden" name="remove" value="1"/>
+
+	<?php if ($this->context->transport->success === true): ?>
+		<p class="alert alert-success">Account settings updated!</p>
+	<?php elseif (isset($this->context->transport->errorMessage)): ?>
+		<p class="alert alert-error">Error: <?php echo $this->context->transport->errorMessage ?></p>
+	<?php endif ?>
+
+	<div>
+		<label class="left">&nbsp;</label>
+		<button type="submit">Delete account</button>
+	</div>
+</form>
diff --git a/src/Views/user-edit.phtml b/src/Views/user-edit.phtml
new file mode 100644
index 00000000..06633d97
--- /dev/null
+++ b/src/Views/user-edit.phtml
@@ -0,0 +1,63 @@
+<form action="<?php echo \Chibi\UrlHelper::route('user', 'edit', ['name' => $this->context->transport->user->name]) ?>" method="post" class="edit aligned" autocomplete="off">
+	<?php if ($this->context->user->id == $this->context->transport->user->id): ?>
+		<div class="current-password">
+			<label class="left" for="current-password">Current password:</label>
+			<div class="input-wrapper"><input type="password" name="current-password" id="current-password" placeholder="Current password"/></div>
+		</div>
+		<hr>
+	<?php endif ?>
+
+	<?php if (PrivilegesHelper::confirm(Privilege::ChangeUserName, PrivilegesHelper::getIdentitySubPrivilege($this->context->transport->user))): ?>
+		<div class="nickname">
+			<label class="left" for="name">Name:</label>
+			<div class="input-wrapper"><input type="text" name="name" id="name" placeholder="New name&hellip;" value="<?php echo $this->context->suppliedName ?>"/></div>
+		</div>
+	<?php endif ?>
+
+	<?php if (PrivilegesHelper::confirm(Privilege::ChangeUserEmail, PrivilegesHelper::getIdentitySubPrivilege($this->context->transport->user))): ?>
+		<div class="email">
+			<label class="left" for="name">E-mail:</label>
+			<div class="input-wrapper"><input type="text" name="email" id="email" placeholder="New e-mail&hellip;" value="<?php echo $this->context->suppliedEmail ?>"/></div>
+		</div>
+	<?php endif ?>
+
+	<?php if (PrivilegesHelper::confirm(Privilege::ChangeUserPassword, PrivilegesHelper::getIdentitySubPrivilege($this->context->transport->user))): ?>
+		<div class="password1">
+			<label class="left" for="password1">New password:</label>
+			<div class="input-wrapper"><input type="password" name="password1" id="password1" placeholder="New password&hellip;" value="<?php echo $this->context->suppliedPassword1 ?>"/></div>
+		</div>
+		<div class="password2">
+			<label class="left" for="password2"></label>
+			<div class="input-wrapper"><input type="password" name="password2" id="password2" placeholder="New password&hellip; (repeat)" value="<?php echo $this->context->suppliedPassword2 ?>"/></div>
+		</div>
+	<?php endif ?>
+
+	<?php if (PrivilegesHelper::confirm(Privilege::ChangeUserAccessRank, PrivilegesHelper::getIdentitySubPrivilege($this->context->transport->user))): ?>
+		<div class="access-rank">
+			<label class="left" for="access-rank">Access rank:</label>
+			<div class="input-wrapper"><select name="access-rank" id="access-rank">
+				<?php foreach (AccessRank::getAll() as $rank): ?>
+					<?php if ($rank == AccessRank::Nobody) continue ?>
+					<?php if (($this->context->suppliedAccessRank != '' and $rank == $this->context->suppliedAccessRank) or ($this->context->suppliedAccessRank == '' and $rank == $this->context->transport->user->access_rank)): ?>
+						<option value="<?php echo $rank ?>" selected="selected">
+					<?php else: ?>
+						<option value="<?php echo $rank ?>">
+					<?php endif ?>
+						<?php echo TextHelper::camelCaseToHumanCase(AccessRank::toString($rank)) ?>
+					</option>
+				<?php endforeach ?>
+			</select></div>
+		</div>
+	<?php endif ?>
+
+	<?php if ($this->context->transport->success === true): ?>
+		<p class="alert alert-success">Account settings updated! <?php if (!empty($this->context->mailSent)) echo 'You will be sent new e-mail address confirmation message soon.' ?></p>
+	<?php elseif (isset($this->context->transport->errorMessage)): ?>
+		<p class="alert alert-error">Error: <?php echo $this->context->transport->errorMessage ?></p>
+	<?php endif ?>
+
+	<div>
+		<label class="left">&nbsp;</label>
+		<button type="submit">Submit</button>
+	</div>
+</form>
diff --git a/src/Views/user-view.phtml b/src/Views/user-view.phtml
index 141e3507..88de28f2 100644
--- a/src/Views/user-view.phtml
+++ b/src/Views/user-view.phtml
@@ -153,94 +153,9 @@
 	<?php endif ?>
 
 	<?php if ($this->context->transport->tab == 'edit'): ?>
-		<form action="<?php echo \Chibi\UrlHelper::route('user', 'edit', ['name' => $this->context->transport->user->name]) ?>" method="post" class="edit aligned" autocomplete="off">
-			<?php if ($this->context->user->id == $this->context->transport->user->id): ?>
-				<div class="current-password">
-					<label class="left" for="current-password">Current password:</label>
-					<div class="input-wrapper"><input type="password" name="current-password" id="current-password" placeholder="Current password"/></div>
-				</div>
-				<hr>
-			<?php endif ?>
-
-			<?php if (PrivilegesHelper::confirm(Privilege::ChangeUserName, PrivilegesHelper::getIdentitySubPrivilege($this->context->transport->user))): ?>
-				<div class="nickname">
-					<label class="left" for="name">Name:</label>
-					<div class="input-wrapper"><input type="text" name="name" id="name" placeholder="New name&hellip;" value="<?php echo $this->context->suppliedName ?>"/></div>
-				</div>
-			<?php endif ?>
-
-			<?php if (PrivilegesHelper::confirm(Privilege::ChangeUserEmail, PrivilegesHelper::getIdentitySubPrivilege($this->context->transport->user))): ?>
-				<div class="email">
-					<label class="left" for="name">E-mail:</label>
-					<div class="input-wrapper"><input type="text" name="email" id="email" placeholder="New e-mail&hellip;" value="<?php echo $this->context->suppliedEmail ?>"/></div>
-				</div>
-			<?php endif ?>
-
-			<?php if (PrivilegesHelper::confirm(Privilege::ChangeUserPassword, PrivilegesHelper::getIdentitySubPrivilege($this->context->transport->user))): ?>
-				<div class="password1">
-					<label class="left" for="password1">New password:</label>
-					<div class="input-wrapper"><input type="password" name="password1" id="password1" placeholder="New password&hellip;" value="<?php echo $this->context->suppliedPassword1 ?>"/></div>
-				</div>
-				<div class="password2">
-					<label class="left" for="password2"></label>
-					<div class="input-wrapper"><input type="password" name="password2" id="password2" placeholder="New password&hellip; (repeat)" value="<?php echo $this->context->suppliedPassword2 ?>"/></div>
-				</div>
-			<?php endif ?>
-
-			<?php if (PrivilegesHelper::confirm(Privilege::ChangeUserAccessRank, PrivilegesHelper::getIdentitySubPrivilege($this->context->transport->user))): ?>
-				<div class="access-rank">
-					<label class="left" for="access-rank">Access rank:</label>
-					<div class="input-wrapper"><select name="access-rank" id="access-rank">
-						<?php foreach (AccessRank::getAll() as $rank): ?>
-							<?php if ($rank == AccessRank::Nobody) continue ?>
-							<?php if (($this->context->suppliedAccessRank != '' and $rank == $this->context->suppliedAccessRank) or ($this->context->suppliedAccessRank == '' and $rank == $this->context->transport->user->access_rank)): ?>
-								<option value="<?php echo $rank ?>" selected="selected">
-							<?php else: ?>
-								<option value="<?php echo $rank ?>">
-							<?php endif ?>
-								<?php echo TextHelper::camelCaseToHumanCase(AccessRank::toString($rank)) ?>
-							</option>
-						<?php endforeach ?>
-					</select></div>
-				</div>
-			<?php endif ?>
-
-			<?php if ($this->context->transport->success === true): ?>
-				<p class="alert alert-success">Account settings updated! <?php if (!empty($this->context->mailSent)) echo 'You will be sent new e-mail address confirmation message soon.' ?></p>
-			<?php elseif (isset($this->context->transport->errorMessage)): ?>
-				<p class="alert alert-error">Error: <?php echo $this->context->transport->errorMessage ?></p>
-			<?php endif ?>
-
-			<div>
-				<label class="left">&nbsp;</label>
-				<button type="submit">Submit</button>
-			</div>
-		</form>
-
+		<?php $this->renderFile('user-edit') ?>
 	<?php elseif ($this->context->transport->tab == 'delete'): ?>
-
-		<form action="<?php echo \Chibi\UrlHelper::route('user', 'delete', ['name' => $this->context->transport->user->name]) ?>" method="post" class="edit aligned" autocomplete="off" data-confirm-text="Are you sure you want to delete your account?">
-			<?php if ($this->context->user->id == $this->context->transport->user->id): ?>
-				<div class="current-password">
-					<label class="left" for="current-password">Current password:</label>
-					<div class="input-wrapper"><input type="password" name="current-password" id="current-password" placeholder="Current password"/></div>
-				</div>
-			<?php endif ?>
-
-			<input type="hidden" name="remove" value="1"/>
-
-			<?php if ($this->context->transport->success === true): ?>
-				<p class="alert alert-success">Account settings updated!</p>
-			<?php elseif (isset($this->context->transport->errorMessage)): ?>
-				<p class="alert alert-error">Error: <?php echo $this->context->transport->errorMessage ?></p>
-			<?php endif ?>
-
-			<div>
-				<label class="left">&nbsp;</label>
-				<button type="submit">Delete account</button>
-			</div>
-		</form>
-
+		<?php $this->renderFile('user-delete') ?>
 	<?php endif ?>
 
 </div>