diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChangePassword.ascx b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChangePassword.ascx
index ea281b409..f03b46cf6 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChangePassword.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChangePassword.ascx
@@ -6,23 +6,23 @@
 <% using (Html.BeginFormAntiForgeryPost()) { %>
     <fieldset>
         <legend><%=_Encoded("Account Information")%></legend>
-        <fieldset>
+        <div>
             <label for="currentPassword"><%=_Encoded("Current password:")%></label>
             <%=Html.Password("currentPassword") %>
             <%=Html.ValidationMessage("currentPassword") %>
-        </fieldset>
-        <fieldset>
+        </div>
+        <div>
             <label for="newPassword"><%=_Encoded("New password:")%></label>
             <%= Html.Password("newPassword") %>
             <%= Html.ValidationMessage("newPassword") %>
-        </fieldset>
-        <fieldset>
+        </div>
+        <div>
             <label for="confirmPassword"><%=_Encoded("Confirm new password:")%></label>
             <%= Html.Password("confirmPassword") %>
             <%= Html.ValidationMessage("confirmPassword") %>
-        </fieldset>
-        <fieldset>
+        </div>
+        <div>
             <input type="submit" value="<%=_Encoded("Change Password") %>" />
-        </fieldset>
+        </div>
     </fieldset>
 <% } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/Register.ascx b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/Register.ascx
index 0f11dea9b..ca9f03f87 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/Register.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/Register.ascx
@@ -6,28 +6,28 @@
 <% using (Html.BeginFormAntiForgeryPost()) { %>
     <fieldset>
         <legend><%=_Encoded("Account Information")%></legend>
-        <fieldset>
+        <div>
             <label for="username"><%=_Encoded("Username:")%></label>
             <%= Html.TextBox("username") %>
             <%= Html.ValidationMessage("username") %>
-        </fieldset>
-        <fieldset>
+        </div>
+        <div>
             <label for="email"><%=_Encoded("Email:")%></label>
             <%= Html.TextBox("email") %>
             <%= Html.ValidationMessage("email") %>
-        </fieldset>
-        <fieldset>
+        </div>
+        <div>
             <label for="password"><%=_Encoded("Password:")%></label>
             <%= Html.Password("password") %>
             <%= Html.ValidationMessage("password") %>
-        </fieldset>
-        <fieldset>
+        </div>
+        <div>
             <label for="confirmPassword"><%=_Encoded("Confirm password:")%></label>
             <%= Html.Password("confirmPassword") %>
             <%= Html.ValidationMessage("confirmPassword") %>
-        </fieldset>
-        <fieldset>
+        </div>
+        <div>
             <input type="submit" value="<%=_Encoded("Register") %>" />
-        </fieldset>
+        </div>
     </fieldset>
 <% } %>
\ No newline at end of file