diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index db435ee0ff1698f536b21e94151ae72b22823a2a..c1d0ce5aa6c7943cd922476da5197b9c64f2e33f 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -373,8 +373,9 @@ class installer_dist extends installer_base {
 		$configfile = 'dovecot-sql.conf';
 		if(is_file("$config_dir/$configfile")){
             copy("$config_dir/$configfile", "$config_dir/$configfile~");
+			exec("chmod 400 $config_dir/$configfile~");
         }
-		exec("chmod 400 $config_dir/$configfile~");
+		
 		$content = rf("tpl/opensuse_dovecot-sql.conf.master");
 		$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
 		$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
diff --git a/install/install.php b/install/install.php
index 46c313e49f2061d168734eaea775db3753034d21..a893d157d1a326eb7881d6b3badb0e335693fe33 100644
--- a/install/install.php
+++ b/install/install.php
@@ -113,7 +113,7 @@ $install_mode = $inst->simple_query('Installation mode', array('standard','exper
 //** Get the hostname
 $tmp_out = array();
 exec('hostname -f', $tmp_out);
-$conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg server1.domain.tld ', $tmp_out[0]);
+$conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg server1.domain.tld ', @$tmp_out[0]);
 unset($tmp_out);
 
 // Check if the mysql functions are loaded in PHP