diff --git a/lib/favorform.php b/lib/favorform.php
index 4f4fd72a9d..8b01483b2e 100644
--- a/lib/favorform.php
+++ b/lib/favorform.php
@@ -125,7 +125,7 @@ class FavorForm extends Form
     function formActions()
     {
         $this->out->submit('favor-submit-' . $this->notice->id,
-                           _('Make a favorite'));
+                           _('Favorite'));
     }
     
     /**
@@ -136,6 +136,6 @@ class FavorForm extends Form
     
     function formClass()
     {
-	return 'favor';
+	return 'notice_favorite';
     }
-}
\ No newline at end of file
+}
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 75a995bef1..eb8a612e4f 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -324,13 +324,11 @@ class HTMLOutputter extends XMLOutputter
 
     function submit($id, $label, $cls='submit', $name=null)
     {
-        $this->elementStart('p');
         $this->element('input', array('type' => 'submit',
                                       'id' => $id,
                                       'name' => ($name) ? $name : $id,
                                       'class' => $cls,
                                       'value' => $label));
-        $this->elementEnd('p');
     }
 
     /**