diff --git a/static/directives/signup-form.html b/static/directives/signup-form.html
index e5ec7f75c..ddd91e081 100644
--- a/static/directives/signup-form.html
+++ b/static/directives/signup-form.html
@@ -28,9 +28,11 @@
            match="newUser.password" required
            ng-pattern="/^.{8,}$/">
 
-    <div class="captcha" quay-require="['RECAPTCHA']"
-         ng-class="{'expanded': newUser.password == newUser.repeatPassword && newUser.password}">
-      <div vc-recaptcha ng-model="newUser.recaptcha_response" key="Config.RECAPTCHA_SITE_KEY"></div>
+    <div quay-require="['RECAPTCHA']">
+      <div class="captcha"
+           ng-class="{'expanded': !!(newUser.password == newUser.repeatPassword && newUser.password)}">
+        <div vc-recaptcha ng-model="newUser.recaptcha_response" key="Config.RECAPTCHA_SITE_KEY"></div>
+      </div>
     </div>
 
     <button id="signupButton"