diff --git a/roles/ipsilon/files/openid_server.py b/roles/ipsilon/files/openid_server.py
index 4b8aeb7ccb..8b0e20e04d 100644
--- a/roles/ipsilon/files/openid_server.py
+++ b/roles/ipsilon/files/openid_server.py
@@ -1059,6 +1059,8 @@ class OpenIDResponse(object):
             if self.fields.isOpenID1() and \
                len(self.encodeToURL()) > OPENID1_URL_LIMIT:
                 return ENCODE_HTML_FORM
+            elif len(self.encodeToURL()) > (6 * 1024):
+                return ENCODE_HTML_FORM
             else:
                 return ENCODE_URL
         else: