diff --git a/Auth/OpenID/Message.php b/Auth/OpenID/Message.php
index 9a5b20d0..b556ebd4 100644
--- a/Auth/OpenID/Message.php
+++ b/Auth/OpenID/Message.php
@@ -663,7 +663,7 @@ function toFormMarkup($action_url, $form_tag_attrs = null,
         $form = "<form accept-charset=\"UTF-8\" ".
             "enctype=\"application/x-www-form-urlencoded\"";
 
-        if (!$form_tag_attrs) {
+        if (empty($form_tag_attrs)) {
             $form_tag_attrs = array();
         }
 
@@ -673,10 +673,8 @@ function toFormMarkup($action_url, $form_tag_attrs = null,
         unset($form_tag_attrs['enctype']);
         unset($form_tag_attrs['accept-charset']);
 
-        if ($form_tag_attrs) {
-            foreach ($form_tag_attrs as $name => $attr) {
-                $form .= sprintf(" %s=\"%s\"", $name, $attr);
-            }
+        foreach ($form_tag_attrs as $name => $attr) {
+        	$form .= sprintf(" %s=\"%s\"", $name, $attr);
         }
 
         $form .= ">\n";