diff --git a/web/templates/login.html b/web/templates/login.html
index df6eb426..d6c838bc 100644
--- a/web/templates/login.html
+++ b/web/templates/login.html
@@ -22,7 +22,12 @@
                                         </tr>
                                         <tr>
                                             <td style="padding: 12px 0 0 2px;">
-                                                <?php print __('Password');?> <a tabindex="5" class="generate" href="/reset/" style="font-size: 8pt; letter-spacing: 0.1em; padding: 0 0 0 14px;"><?php print __('forgot password');?></a>
+                                                <?php print __('Password');?>
+                                                <span style="padding:0 0 0 14px;">
+                                                    <a tabindex="5" class="generate" href="/reset/" style="font-size: 8pt; letter-spacing: 0.1em;">
+                                                        <?php print __('forgot password');?>
+                                                    </a>
+                                                </span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -45,10 +50,10 @@
                         </tr>
                         <tr>
                             <td colspan=2>
-                                <table class="login-bottom">
-                                    <tr><td>.<?php if (isset($ERROR)) echo $ERROR ?></td></tr>
-                                    <tr><td> <a tabindex="6" class="vestacp" href="http://vestacp.com" >vestacp.com</a></td></tr>
-                                </table>
+                                <div class="login-bottom">
+                                    <div style="height:20px"><?php if (isset($ERROR)) echo $ERROR ?></div>
+                                    <a class="vestacp" href="http://vestacp.com" >vestacp.com</a>
+                                </div>
                             </td>
                         </tr>
                     </table>
diff --git a/web/templates/reset_1.html b/web/templates/reset_1.html
index cdc3a71e..291ecba8 100644
--- a/web/templates/reset_1.html
+++ b/web/templates/reset_1.html
@@ -8,7 +8,7 @@
                                     <a href="/"><img border=0 src="/images/logo.png" width="124px" height="46px" alt="Vesta Control Panel" /></a>
                                 </td>
                                 <td style="padding: 10px 0 0 0;">
-                                    <form method="post" action="/reset/" >
+                                    <form method="post" action="/reset/">
                                         <table class="login-box">
                                             <tr>
                                             <td style="padding: 12px 0 0 2px;">
@@ -28,6 +28,7 @@
                                             <tr>
                                                 <td style="padding: 20px 0 12px 0;">
                                                     <input tabindex="2" type="submit" value="<?php print __('Submit');?>" class="button">
+                                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="location.href='/login/'">
                                                 </td>
                                             </tr>
                                         </table>
@@ -36,10 +37,10 @@
                             </tr>
                             <tr>
                                 <td colspan=2>
-                                    <table class="login-bottom">
-                                        <tr><td>.<?php if (isset($ERROR)) echo $ERROR ?></td></tr>
-                                        <tr><td><a tabindex="6" class="vestacp" href="http://vestacp.com" >vestacp.com</a></td></tr>
-                                    </table>
+                                    <div class="login-bottom">
+                                        <div style="height:20px"><?php if (isset($ERROR)) echo $ERROR ?></div>
+                                        <a class="vestacp" href="http://vestacp.com" >vestacp.com</a>
+                                    </div>
                                 </td>
                             </tr>
                         </table>
diff --git a/web/templates/reset_2.html b/web/templates/reset_2.html
index 8658078e..917bb0ff 100644
--- a/web/templates/reset_2.html
+++ b/web/templates/reset_2.html
@@ -16,7 +16,7 @@
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td style="padding: 12px 0 0 2px;"><?php print __('Reset Code');?></td>
+                                                <td style="padding: 12px 0 0 2px;" colspan=2><?php print __('Reset Code');?></td>
                                             </tr>
                                             <tr>
                                                 <td>
@@ -28,6 +28,7 @@
                                             <tr>
                                                 <td style="padding: 20px 0 12px 0;">
                                                     <input tabindex="2" type="submit" value="<?php print __('Confirm');?>" class="button">
+                                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="location.href='/reset/'">
                                                 </td>
                                             </tr>
                                         </table>
@@ -36,10 +37,10 @@
                             </tr>
                             <tr>
                                 <td colspan=2>
-                                    <table class="login-bottom">
-                                        <tr><td>.<?php if (isset($ERROR)) echo $ERROR ?></td></tr>
-                                        <tr><td><a tabindex="6" class="vestacp" href="http://vestacp.com" >vestacp.com</a></td></tr>
-                                    </table>
+                                    <div class="login-bottom">
+                                        <div style="height:20px"><?php if (isset($ERROR)) echo $ERROR ?></div>
+                                        <a class="vestacp" href="http://vestacp.com" >vestacp.com</a>
+                                    </div>
                                 </td>
                             </tr>
                         </table>
diff --git a/web/templates/reset_3.html b/web/templates/reset_3.html
index 396f55f4..fdd0192e 100644
--- a/web/templates/reset_3.html
+++ b/web/templates/reset_3.html
@@ -4,10 +4,10 @@
                     <td>
                         <table>
                             <tr>
-                                <td style="padding: 0 10 0 42; height: 280px; width: 170px;">
+                                <td style="padding: 0 10px 0 42px; height: 280px; width: 170px;">
                                     <a href="/"><img border=0 src="/images/logo.png" width="124px" height="46px" alt="Vesta Control Panel" /></a>
                                 </td>
-                                <td style="padding: 20px 0 0 0;">
+                                <td style="padding: 10px 0 0 0;">
                                     <form method="post">
                                         <table class="login-box">
                                             <tr>
@@ -34,12 +34,9 @@
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td height="28px">
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td style="padding: 0 0 12px 0;">
+                                                <td style="padding: 20px 0 12px 0;">
                                                     <input tabindex="3" type="submit" value="<?php print __('Reset');?>" class="button">
+                                                    <input type="button" class="button" value="<?php print __('Back');?>" onclick="location.href='/login/'">
                                                 </td>
                                             </tr>
                                         </table>
@@ -48,10 +45,10 @@
                             </tr>
                             <tr>
                                 <td colspan=2>
-                                    <table class="login-bottom">
-                                        <tr><td>.<?php if (isset($ERROR)) echo $ERROR ?></td></tr>
-                                        <tr><td> <a tabindex="6" class="vestacp" href="http://vestacp.com" >vestacp.com</a></td></tr>
-                                    </table>
+                                    <div class="login-bottom">
+                                        <div style="height:20px"><?php if (isset($ERROR)) echo $ERROR ?></div>
+                                        <a class="vestacp" href="http://vestacp.com" >vestacp.com</a>
+                                    </div>
                                 </td>
                             </tr>
                         </table>