diff --git a/CTFd/themes/original/templates/register.html b/CTFd/themes/original/templates/register.html
index 01b40cff..3c049e12 100644
--- a/CTFd/themes/original/templates/register.html
+++ b/CTFd/themes/original/templates/register.html
@@ -23,7 +23,7 @@
 				<div class="row">
 					<div class="col-md-12">
 						<span class="input">
-						<input class="input-field" type="text" name="name" id="input-10" />
+						<input class="input-field" type="text" name="name" id="input-10" {% if name %}value="{{ name }}"{% endif %} />
 						<label class="input-label" for="input-10">
 							<span class="label-content" data-content="Team Name">Team Name</span>
 						</label>
@@ -33,7 +33,7 @@
 				<div class="row">
 					<div class="col-md-12">
 						<span class="input">
-						<input class="input-field" type="text" name="email" id="input-10" />
+						<input class="input-field" type="text" name="email" id="input-10" {% if email %}value="{{ email }}"{% endif %} />
 						<label class="input-label" for="input-10">
 							<span class="label-content" data-content="Email">Email</span>
 						</label>
@@ -43,7 +43,7 @@
 				<div class="row">
 					<div class="col-md-12">
 						<span class="input">
-						<input class="input-field" type="password" name="password" id="input-10" />
+						<input class="input-field" type="password" name="password" id="input-10" {% if password %}value="{{ password }}"{% endif %}/>
 						<label class="input-label" for="input-10">
 							<span class="label-content" data-content="Password">Password</span>
 						</label>