diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py
index 26cbfe65..9076a67a 100644
--- a/ee/cli/plugins/stack.py
+++ b/ee/cli/plugins/stack.py
@@ -466,7 +466,7 @@ class EEStackController(CementBaseController):
                                      "/dovecot.pem")
 
                 # Custom Dovecot configuration by EasyEngine
-                data = dict()
+                data = dict(email=EEVariables.ee_email)
                 Log.debug(self, "Writting configuration into file"
                           "/etc/dovecot/conf.d/99-ee.conf ")
                 ee_dovecot = open('/etc/dovecot/conf.d/99-ee.conf', 'w')
@@ -789,7 +789,13 @@ class EEStackController(CementBaseController):
                     Log.debug(self, "Creating directory "
                               "/etc/postfix/mysql/")
                     os.makedirs('/etc/postfix/mysql/')
-                data = dict(password=vm_passwd, host=EEVariables.ee_mysql_host)
+
+                if EEVariables.ee_mysql_host is "localhost":
+                    data = dict(password=vm_passwd, host="127.0.0.1")
+                else:
+                    data = dict(password=vm_passwd,
+                                host=EEVariables.ee_mysql_host)
+
                 vm_config = open('/etc/postfix/mysql/virtual_alias_maps.cf',
                                  'w')
                 self.app.render((data), 'virtual_alias_maps.mustache',