diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 8bf3f63fd..9728acd48 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -30,12 +30,10 @@ sub formbuilder_setup (@) { #{{{
 	if ($form->title eq "signin") {
  		$form->field(
 			name => "openid_url",
-			label => "OpenID",
+			label => "",
+			fieldset => gettext("Log in with")." ".htmllink("", "", "OpenID", noimageinline => 1),
 			size => 30,
-			comment => '('.
-				htmllink("", "", "OpenID", noimageinline => 1, linktext => gettext("What's this?"))
-				.($config{openidsignup} ? " | <a href=\"$config{openidsignup}\">".gettext("Get an OpenID")."</a>" : "")
-				.')'
+			comment => ($config{openidsignup} ? "(<a href=\"$config{openidsignup}\">".gettext("Get an OpenID")."</a>)" : "")
 		);
 
 		# Handle submission of an OpenID as validation.
diff --git a/debian/changelog b/debian/changelog
index 6ca389cf9..37e7e28b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ ikiwiki (1.52) UNRELEASED; urgency=low
   [ Joey Hess ]
   * Use fieldsets in the preferences form to group related options together.
     Especially cleans up the ordering of the admin's preferences form.
+  * Use a fieldset to set off the openid entry from the rest of the login
+    form.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 29 Apr 2007 18:28:35 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 29 Apr 2007 18:47:00 -0400
 
 ikiwiki (1.51) unstable; urgency=low
 
diff --git a/doc/bugs/login_page_non-obvious_with_openid.mdwn b/doc/bugs/login_page_non-obvious_with_openid.mdwn
index b2da1e423..5cffde7f4 100644
--- a/doc/bugs/login_page_non-obvious_with_openid.mdwn
+++ b/doc/bugs/login_page_non-obvious_with_openid.mdwn
@@ -40,3 +40,6 @@ If you want to keep it as one form, then perhaps using some javascript to disabl
 > is displayed instead of the regular signin form, and it should be
 > possible to use that to manually lay it out better than FormBuilder
 > manages with its automatic layout. --[[Joey]]
+
+> I've improved the form, I think it's more obvious now that the openid
+> stuff is separate. Good enough to call this [[done]]. I think. --[[Joey]]