lib/openid/consumer/checkid_request.rb in ruby-openid-2.2.3 vs lib/openid/consumer/checkid_request.rb in ruby-openid-2.3.0

@@ -119,10 +119,10 @@
           if message.is_openid2
             message.set_arg(OPENID2_NS, 'claimed_id', claimed_id)
           end
         end
 
-        if @assoc
+        if @assoc && (message.is_openid1 || !['checkid_setup', 'checkid_immediate'].include?(mode))
           message.set_arg(OPENID_NS, 'assoc_handle', @assoc.handle)
           assoc_log_msg = "with assocication #{@assoc.handle}"
         else
           assoc_log_msg = 'using stateless mode.'
         end