diff --git a/templates/zerver/realm_redirect.html b/templates/zerver/realm_redirect.html
index 9df8484b8f..d81c657d7d 100644
--- a/templates/zerver/realm_redirect.html
+++ b/templates/zerver/realm_redirect.html
@@ -11,7 +11,7 @@
         <div class="app-main goto-account-page-container white-box">
             <div class="realm-redirect-form">
                 <form class="form-inline" name="realm_redirect_form"
-                  action="/accounts/go/?{{ request.GET.urlencode() }}" method="post">
+                  action="/accounts/go/{% if request.GET %}?{{ request.GET.urlencode() }}{% endif %}" method="post">
                     {{ csrf_input }}
                     <div class="input-box moving-label horizontal">
                         <div class="inline-block relative">