diff --git a/src/Orchard.Web/Themes/Contoso/Styles/site.css b/src/Orchard.Web/Themes/Contoso/Styles/site.css
index f1424626a..d92dd7aa8 100644
--- a/src/Orchard.Web/Themes/Contoso/Styles/site.css
+++ b/src/Orchard.Web/Themes/Contoso/Styles/site.css
@@ -172,9 +172,10 @@ caption     { background: #eee; }
    
 -------------------------------------------------------------- */
 
-label       { font-weight: normal; }
-fieldset    { padding:0em; margin: 0 0 0em 0; border: 0px solid #ccc; }
-legend      { font-weight: bold; font-size:1.2em; }
+label             { font-weight: normal; display:block; }
+label.forcheckbox { margin:0 0 0 4px; display:inline; }
+fieldset          { padding:0em; margin: 0 0 0em 0; border: 0px solid #ccc; }
+legend            { font-weight: bold; font-size:1.2em; }
 
 
 /* Form fields
diff --git a/src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx b/src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx
index a54cc96d2..3a65a9e7d 100644
--- a/src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx
+++ b/src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx
@@ -9,7 +9,7 @@ using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Reques
 <fieldset class="login-form">
     <legend><%=_Encoded("Account Information")%></legend>
     <div class="group">
-        <label for="username"><%=_Encoded("Username:")%></label>
+        <label for="userNameOrEmail"><%=_Encoded("Username or Email:")%></label>
         <%= Html.TextBox("userNameOrEmail", "", new { autofocus = "autofocus" })%>
         <%= Html.ValidationMessage("userNameOrEmail")%>
     </div>
diff --git a/src/Orchard.Web/Themes/Corporate/Styles/site.css b/src/Orchard.Web/Themes/Corporate/Styles/site.css
index cbc127a02..5d76a2214 100644
--- a/src/Orchard.Web/Themes/Corporate/Styles/site.css
+++ b/src/Orchard.Web/Themes/Corporate/Styles/site.css
@@ -170,9 +170,10 @@ caption     { background: #eee; }
    
 -------------------------------------------------------------- */
 
-label       { font-weight: normal; }
-fieldset    { padding:0em; margin: 0 0 0em 0; border: 0px solid #ccc; }
-legend      { font-weight: bold; font-size:1.2em; }
+label             { font-weight: normal; display:block; }
+label.forcheckbox { margin:0 0 0 4px; display:inline; }
+fieldset          { padding:0em; margin: 0 0 0em 0; border: 0px solid #ccc; }
+legend            { font-weight: bold; font-size:1.2em; }
 
 
 /* Form fields
diff --git a/src/Orchard.Web/Themes/Corporate/Views/LogOn.ascx b/src/Orchard.Web/Themes/Corporate/Views/LogOn.ascx
index a54cc96d2..387747097 100644
--- a/src/Orchard.Web/Themes/Corporate/Views/LogOn.ascx
+++ b/src/Orchard.Web/Themes/Corporate/Views/LogOn.ascx
@@ -9,9 +9,9 @@ using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Reques
 <fieldset class="login-form">
     <legend><%=_Encoded("Account Information")%></legend>
     <div class="group">
-        <label for="username"><%=_Encoded("Username:")%></label>
-        <%= Html.TextBox("userNameOrEmail", "", new { autofocus = "autofocus" })%>
-        <%= Html.ValidationMessage("userNameOrEmail")%>
+         <label for="userNameOrEmail"><%=_Encoded("Username or Email:")%></label>
+         <%= Html.TextBox("userNameOrEmail", "", new { autofocus = "autofocus" })%>
+         <%= Html.ValidationMessage("userNameOrEmail")%>
     </div>
     <div class="group">
         <label for="password"><%=_Encoded("Password:")%></label>