diff --git a/webmails/roundcube/config.inc.php b/webmails/roundcube/config.inc.php
index 379b3025..603fc95b 100644
--- a/webmails/roundcube/config.inc.php
+++ b/webmails/roundcube/config.inc.php
@@ -18,16 +18,19 @@ $config['plugins'] = array(
     'enigma'
 );
 
+$front = getenv('FRONT_ADDRESS') ? getenv('FRONT_ADDRESS') : 'front';
+$imap  = getenv('IMAP_ADDRESS')  ? getenv('IMAP_ADDRESS')  : 'imap';
+
 // Mail servers
-$config['default_host'] = getenv('FRONT_ADDRESS') || 'front';
+$config['default_host'] = $front;
 $config['default_port'] = 10143;
-$config['smtp_server'] = getenv('FRONT_ADDRESS') || 'front';
+$config['smtp_server'] = $front;
 $config['smtp_port'] = 10025;
 $config['smtp_user'] = '%u';
 $config['smtp_pass'] = '%p';
 
 // Sieve script management
-$config['managesieve_host'] = getenv('IMAP_ADDRESS') || 'imap';
+$config['managesieve_host'] = $imap;
 $config['managesieve_usetls'] = false;
 
 // We access the IMAP and SMTP servers locally with internal names, SSL