diff --git a/web/login/index.php b/web/login/index.php
index 332f8ee6c..461f1f92e 100644
--- a/web/login/index.php
+++ b/web/login/index.php
@@ -1,7 +1,12 @@
 <?php
-session_start();
 
 define('NO_AUTH_REQUIRED',true);
+
+
+// Main include
+include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
+
+
 $TAB = 'LOGIN';
 
 // Logout
@@ -9,8 +14,6 @@ if (isset($_GET['logout'])) {
     session_destroy();
 }
 
-// Main include
-include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Login as someone else
 if (isset($_SESSION['user'])) {
diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html
index d530bdf1c..811bc1873 100644
--- a/web/templates/admin/add_mail_acc.html
+++ b/web/templates/admin/add_mail_acc.html
@@ -50,6 +50,28 @@
                     }
                     document.v_add_mail_acc.v_password.value = randomstring;
                   }
+                $(document).ready(function() {
+                    $('#v_account').text($('input[name=v_account]').val());
+                    $('#v_password').text($('input[name=v_password]').val());
+
+                    $('input[name=v_account]').change(function(){
+                      $('#v_account').text($(this).val());
+                    });
+
+                    $('input[name=v_password]').change(function(){
+                      if($('input[name=v_password]').attr('type') == 'text')
+                        $('#v_password').text($(this).val());
+                      else
+                        $('#v_password').text(Array($(this).val().length+1).join('*'));
+                    });
+
+                    $('.toggle-psw-visibility-icon').click(function(){
+                      if($('input[name=v_password]').attr('type') == 'text')
+                        $('#v_password').text($('input[name=v_password]').val());
+                      else
+                        $('#v_password').text(Array($('input[name=v_password]').val().length+1).join('*'));
+                    });
+                });
             </script>
 
             <table class="data mode-add">
@@ -150,6 +172,53 @@
                     </tr>
                 </table>
             </td>
+            <td class="mail-infoblock-td">
+                <div class="mail-infoblock">
+                <table>
+                    <tr>
+                        <td>Username:</td>
+                        <td><span id="v_account">william.cage</span>@<?=htmlentities($v_domain)?></td>
+                    </tr>
+                    <tr>
+                        <td>Password:</td>
+                        <td id="v_password">******</td>
+                    </tr>
+                    <tr>
+                        <td>IMAP hostname:</td>
+                        <td><?=htmlentities($v_domain)?></td>
+                    </tr>
+                    <tr>
+                        <td>IMAP port:</td>
+                        <td>143</td>
+                    </tr>
+                    <tr>
+                        <td>IMAP security:</td>
+                        <td>STARTTLS</td>
+                    </tr>
+                    <tr>
+                        <td>IMAP auth method:</td>
+                        <td>Normal password</td>
+                    </tr>
+                    <tr>
+                        <td>SMTP hostname</td>
+                        <td><?=htmlentities($v_domain)?></td>
+                    </tr>
+                    <tr>
+                        <td>SMTP port:</td>
+                        <td>587</td>
+                    </tr>
+                    <tr>
+                        <td>SMTP security:</td>
+                        <td>STARTTLS</td>
+                    </tr>
+                    <tr>
+                        <td>SMTP auth method:</td>
+                        <td>Normal password</td>
+                    </tr>
+                </table>
+                </div>
+            </td>
+
         </tr>
     </table>
     </form>