diff --git a/views/bonfire/show.jade b/views/bonfire/show.jade
index 39bf14d496c..9100cd6575e 100644
--- a/views/bonfire/show.jade
+++ b/views/bonfire/show.jade
@@ -70,12 +70,12 @@ block content
                                                     input.form-control(ng-show="false")
                                                     span.input-group-addon @
                                                     input.form-control#completed-with(name="existingUser", placeholder='Otherwise just leave it blank', existing-username='', ng-model="existingUser", autofocus)
-                                            .col-xs-10.col-xs-offset-1.col-sm-8.col-sm-offset-2.col-md-8.col-md-offset-2(ng-show="completedWithForm.$error.exists && !completedWithForm.existingUser.$pristine")
+                                            .col-xs-10.col-xs-offset-1.col-sm-8.col-sm-offset-2.col-md-8.col-md-offset-2(ng-show="completedWithForm.$error.exists && !completedWithForm.existingUser.$pristine && existingUser.length > 0")
                                                 alert(type='danger')
                                                     span.ion-close-circled
                                                     | Username not found
 
-                                    a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block.next-bonfire-button(name='_csrf', value=_csrf, aria-hidden='true', ng-disabled='completedWithForm.$invalid') Take me to my next challenge
+                                    a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block.next-bonfire-button(name='_csrf', value=_csrf, aria-hidden='true', ng-disabled='completedWithForm.$invalid && existingUser.length > 0') Take me to my next challenge
 
 
                                     - if (points && points > 2)