diff --git a/extensions/BMO/template/en/default/account/create.html.tmpl b/extensions/BMO/template/en/default/account/create.html.tmpl
index 33eaee817c..1a938bddde 100644
--- a/extensions/BMO/template/en/default/account/create.html.tmpl
+++ b/extensions/BMO/template/en/default/account/create.html.tmpl
@@ -134,7 +134,7 @@ function onSubmit() {
     <tr>
     <td class="label">Email Address:</td>
     <td>
-      <input type="email" size="35" id="login" name="login" placeholder="you@example.com">[% Param('emailsuffix') FILTER html %]
+      <input size="35" id="login" name="login" placeholder="you@example.com">[% Param('emailsuffix') FILTER html %]
     </td>
     </tr>
     <tr>
diff --git a/extensions/BugModal/web/bug_modal.css b/extensions/BugModal/web/bug_modal.css
index 3893f41633..f96b6b8ff9 100644
--- a/extensions/BugModal/web/bug_modal.css
+++ b/extensions/BugModal/web/bug_modal.css
@@ -1440,7 +1440,7 @@ a.comment-tag-url {
 
 #main-inner {
   display: flow-root;
-  margin: 0 auto;
+  margin: 8px auto;
   max-width: 1024px;
 }
 
diff --git a/qa/t/4_test_user_privs.t b/qa/t/4_test_user_privs.t
index 24a27422d0..646e60bbc8 100644
--- a/qa/t/4_test_user_privs.t
+++ b/qa/t/4_test_user_privs.t
@@ -56,7 +56,7 @@ ok(
 # Don't call log_in() here. We explicitly want to use the "log in" link
 # in the addl. comment box.
 
-$sel->click_ok("//a[./span[contains(text(), 'Log In')]]");
+$sel->click_ok("link=log in");
 $sel->wait_for_page_to_load_ok(WAIT_TIME);
 $sel->title_is("Log in to Bugzilla");
 $sel->is_text_present_ok("Log in to Bugzilla");