diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 1e2cbd114..ef51ab288 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.8.5
+ - The captcha form control had it's built in styles removed in favor of two classes: "wg-captchaForm" and "wg-captchaImage"
 
 7.8.4
  - Fixed a compatibility problem between WRE and new Spectre code.
diff --git a/lib/WebGUI/Form/Captcha.pm b/lib/WebGUI/Form/Captcha.pm
index deb9832df..defd3ec50 100644
--- a/lib/WebGUI/Form/Captcha.pm
+++ b/lib/WebGUI/Form/Captcha.pm
@@ -178,8 +178,9 @@ sub toHtml {
     my ($filename, $challenge) = $storage->addFileFromCaptcha;
     $self->set("size", 6);
     $self->set("maxlength", 6);
+    $self->set("extras", 'class="wg-captchaForm"');
     $self->session->scratch->set("captcha_".$self->get("name"), $challenge);
-    return $self->SUPER::toHtml.'<p style="display:inline;vertical-align:middle;"><img src="'.$storage->getUrl($filename).'" style="border-style:none;vertical-align:middle;" alt="captcha" /></p>';
+    return $self->SUPER::toHtml.'<img src="'.$storage->getUrl($filename).'" class="wg-captchaImage" alt="captcha" />';
 }
 
 =head2 getErrorMessage ( )