diff --git a/css/default/easy-wi.css b/css/default/easy-wi.css
index e945bc27..932019b2 100644
--- a/css/default/easy-wi.css
+++ b/css/default/easy-wi.css
@@ -89,4 +89,7 @@ table form {
 }
 .formmailfield{
 	width:50%;
+}
+.twitter-button-margin {
+    margin: 14px 5px 0;
 }
\ No newline at end of file
diff --git a/install/install.php b/install/install.php
index e44d5e55..18300792 100644
--- a/install/install.php
+++ b/install/install.php
@@ -301,6 +301,7 @@ if ($currentStep == 2 and count($systemCheckError) == 0) {
 " . '$debug' . " = '0';
 " . '$timezone' . " = 'Europe/Berlin';
 " . '$coloreddashboard' . " = false;
+" . '$easywitweets' . " = true;
 ";
 
                 @fwrite($configFp, $configdata);
@@ -789,6 +790,7 @@ if ($currentStep == 7 and count($systemCheckError) == 0) {
 " . '$debug' . " = '0';
 " . '$timezone' . " = '" . $_POST['timezone'] . "';
 " . '$coloreddashboard' . " = false;
+" . '$easywitweets' . " = true;
 ";
 
                 @fwrite($configFp, $configdata);
diff --git a/stuff/admin/panel_settings_email.php b/stuff/admin/panel_settings_email.php
index c6b1c364..cc2e5822 100644
--- a/stuff/admin/panel_settings_email.php
+++ b/stuff/admin/panel_settings_email.php
@@ -180,7 +180,7 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
                 'vServer' => array('emailvrescue','emailvinstall'),
                 'Server' => array('emailbackup','emailbackuprestore','emailserverinstall','emailsecuritybreach','emaildown','emaildownrestart'),
                 'Ticket' => array('emailnewticket'),
-                'General' => array('emailfooter','emailregards','emailuseradd','emailpwrecovery','emailregister'),
+                'General' => array('emailfooter','emailregards','emailuseradd','emailpwrecovery','emailregister', 'emaileasyupdate'),
                 'VoiceServer' => array('emailvoicemasterold'),
                 'GameServer' => array('emailgserverupdate')
             );
diff --git a/stuff/methods/functions.php b/stuff/methods/functions.php
index 9e3ae271..c92f4774 100644
--- a/stuff/methods/functions.php
+++ b/stuff/methods/functions.php
@@ -806,8 +806,14 @@ if (!function_exists('passwordgenerate')) {
                 $noreply='(This is an automated mail. Please do not reply to it since the account is configured to send only.)';
                 $emailfooter ='';
                 $emailregards ='';
+                $ip = '';
+                $port = '';
+                if(isset($server)){
+                    list($ip, $port) = explode(":", $server);
+                }
+
                 $keys = array('%emailfooter%','%emailregards%','%noreply%','%topic%','%id%','%creationTime%','%active%','%salutation%','%cname%','%fullname%','%name%','%vname%','%birthday%','%mail%','%email%','%phone%','%fax%','%handy%','%country%','%city%','%cityn%','%street%','%streetn%','%language%','%lastlogin%','%urlhost%','%password%','%server%','%username%','%date%','%shorten%','%ip%','%port%','%port2%','%port3%','%port4%','%port5%','%ports%');
-                $replacements = array($emailfooter, $emailregards, $noreply, $topic, $email_id, $email_creationTime, $email_active, $salutation, $email_cname, $fullname, $email_name, $email_vname, $email_birthday, $email_mail, $email_mail, $email_phone, $email_fax, $email_handy, $email_country, $email_city, $email_cityn, $email_street, $email_streetn, $userLanguage, $email_lastlogin, $email_urlhost, $password, $server, $username, $maildate, $shorten);
+                $replacements = array($emailfooter, $emailregards, $noreply, $topic, $email_id, $email_creationTime, $email_active, $salutation, $email_cname, $fullname, $email_name, $email_vname, $email_birthday, $email_mail, $email_mail, $email_phone, $email_fax, $email_handy, $email_country, $email_city, $email_cityn, $email_street, $email_streetn, $userLanguage, $email_lastlogin, $email_urlhost, $password, $server, $username, $maildate, $shorten, $ip, $port);
 
                 //More IP Adress
                 if (is_array($connectInfo) and count($connectInfo) > 0 and isset($connectInfo['ip'])) {
diff --git a/template/default/admin/admin_header.tpl b/template/default/admin/admin_header.tpl
index 6b7b597d..017b4d62 100644
--- a/template/default/admin/admin_header.tpl
+++ b/template/default/admin/admin_header.tpl
@@ -66,6 +66,10 @@
 
             <div class="navbar-custom-menu">
                 <ul class="nav navbar-nav">
+                    <li class="dropdown messages-menu hidden-xs twitter-button-margin">
+                        <a href="https://twitter.com/easy_wi?ref_src=twsrc%5Etfw" class="twitter-follow-button"  data-show-count="false">Follow @easy_wi</a>
+                        <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
+                    </li>
                     <?php if(isset($toooldversion)){ ?>
                     <!-- Messages: style can be found in dropdown.less-->
                     <li class="dropdown messages-menu hidden-xs">
diff --git a/template/default/admin/admin_home.tpl b/template/default/admin/admin_home.tpl
index 2a6355b4..c94adedd 100644
--- a/template/default/admin/admin_home.tpl
+++ b/template/default/admin/admin_home.tpl
@@ -416,6 +416,17 @@
     </div>
     <?php }?>
 
+    <?php if(isset($easywitweets) && $easywitweets) { ?>
+    <hr>
+    <div class="row">
+        <div class="col-md-6" >
+            <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
+            <a class="twitter-timeline" href="https://twitter.com/easy_wi?ref_src=twsrc^tfw">Tweets by easy_wi</a>
+        </div>
+    </div>
+
+    <?php } ?>
+
     <?php if(count($feedArray)>0) { ?>
     <hr>