diff --git a/templates/confirmation/confirm_preregistrationuser.html b/templates/confirmation/confirm_preregistrationuser.html
index a8946cf7e4..67bb92428d 100644
--- a/templates/confirmation/confirm_preregistrationuser.html
+++ b/templates/confirmation/confirm_preregistrationuser.html
@@ -12,7 +12,7 @@ post to another view which executes in our code to produce the desired form.
     {% csrf_token %}
     <input type="hidden" value="{{ key }}" name="key"/>
     <input type="hidden" value="1" name="from_confirmation"/>
-    <input type="hidden" value="{{ gafyd_name }}" name="gafyd_name"/>
+    <input type="hidden" value="{% if gafyd_name %}{{ gafyd_name }}{% endif %}" name="gafyd_name"/>
 </form>
 
 <script type="text/javascript">
diff --git a/templates/zephyr/register.html b/templates/zephyr/register.html
index 6408640bf1..eedf3a30f4 100644
--- a/templates/zephyr/register.html
+++ b/templates/zephyr/register.html
@@ -36,7 +36,7 @@ Form is validated both client-side using jquery-validate (see signup.js) and ser
         <label for="id_full_name" class="control-label">Full name</label>
         <div class="controls">
             <input id="id_full_name" class="required" type="text" name="full_name"
-                   value="{% if form.full_name.value %}{{ form.full_name.value }}{% else %}{{ gafyd_name }}{% endif %}"
+                   value="{% if form.full_name.value %}{{ form.full_name.value }}{% elif gafyd_name %}{{ gafyd_name }}{% endif %}"
                    maxlength="100" />
             {% if form.full_name.errors %}
                 {% for error in form.full_name.errors %}