diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 56e0f29485de7e69e72a1ac061a3c012e4fc8899..1d2b02999402fb008e906dfcb1de2c624620cd3c 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -690,6 +690,11 @@ class installer_dist extends installer_base {
 		exec('crontab -u root -l > crontab.txt');
 		$existing_root_cron_jobs = file('crontab.txt');
 		
+		// remove existing ispconfig cronjobs, in case the syntax has changed
+		foreach($existing_root_cron_jobs as $key => $val) {
+			if(stristr($val,'/usr/local/ispconfig')) unset($existing_root_cron_jobs[$key]);
+		}
+		
 		$root_cron_jobs = array(
 			'* * * * * /usr/local/ispconfig/server/server.sh &> /dev/null',
 			'30 00 * * * /usr/local/ispconfig/server/cron_daily.sh &> /dev/null'
@@ -704,19 +709,27 @@ class installer_dist extends installer_base {
 		unlink('crontab.txt');
 		
 		//* Getmail crontab
-        $cf = $conf['getmail'];
-		exec('crontab -u getmail -l > crontab.txt');
-		$existing_cron_jobs = file('crontab.txt');
-		
-		$cron_jobs = array('*/5 * * * * '.$cf['program'].' -g '.$cf['config_dir'].' -r '.$cf['config_dir'].'/*.conf &> /dev/null');
-		foreach($cron_jobs as $cron_job) {
-			if(!in_array($cron_job."\n", $existing_cron_jobs)) {
-				$existing_cron_jobs[] = $cron_job."\n";
+		if(is_user('getmail')) {
+        	$cf = $conf['getmail'];
+			exec('crontab -u getmail -l > crontab.txt');
+			$existing_cron_jobs = file('crontab.txt');
+		
+			$cron_jobs = array('*/5 * * * * '.$cf['program'].' -g '.$cf['config_dir'].' -r '.$cf['config_dir'].'/*.conf &> /dev/null');
+			
+			// remove existing ispconfig cronjobs, in case the syntax has changed
+			foreach($cron_jobs as $key => $val) {
+				if(stristr($val,$cf['program'])) unset($cron_jobs[$key]);
 			}
+			
+			foreach($cron_jobs as $cron_job) {
+				if(!in_array($cron_job."\n", $existing_cron_jobs)) {
+					$existing_cron_jobs[] = $cron_job."\n";
+				}
+			}
+			file_put_contents('crontab.txt', $existing_cron_jobs);
+			exec('crontab -u getmail crontab.txt &> /dev/null');
+			unlink('crontab.txt');
 		}
-		file_put_contents('crontab.txt', $existing_cron_jobs);
-		exec('crontab -u getmail crontab.txt &> /dev/null');
-		unlink('crontab.txt');
 	}
 
 }
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index c164ba34e232495240b5fa73a65941754a38cbc8..9ded93eb11b69bb9d0f4354a0b1397a24977d3d0 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -708,6 +708,11 @@ class installer_dist extends installer_base {
 		exec('crontab -u root -l > crontab.txt');
 		$existing_root_cron_jobs = file('crontab.txt');
 		
+		// remove existing ispconfig cronjobs, in case the syntax has changed
+		foreach($existing_root_cron_jobs as $key => $val) {
+			if(stristr($val,'/usr/local/ispconfig')) unset($existing_root_cron_jobs[$key]);
+		}
+		
 		$root_cron_jobs = array(
 			'* * * * * /usr/local/ispconfig/server/server.sh &> /dev/null',
 			'30 00 * * * /usr/local/ispconfig/server/cron_daily.sh &> /dev/null'
@@ -722,19 +727,27 @@ class installer_dist extends installer_base {
 		unlink('crontab.txt');
 		
 		//* Getmail crontab
-        $cf = $conf['getmail'];
-		exec('crontab -u getmail -l > crontab.txt');
-		$existing_cron_jobs = file('crontab.txt');
-		
-		$cron_jobs = array('*/5 * * * * '.$cf['program'].' -g '.$cf['config_dir'].' -r '.$cf['config_dir'].'/*.conf &> /dev/null');
-		foreach($cron_jobs as $cron_job) {
-			if(!in_array($cron_job."\n", $existing_cron_jobs)) {
-				$existing_cron_jobs[] = $cron_job."\n";
+		if(is_user('getmail')) {
+        	$cf = $conf['getmail'];
+			exec('crontab -u getmail -l > crontab.txt');
+			$existing_cron_jobs = file('crontab.txt');
+		
+			$cron_jobs = array('*/5 * * * * '.$cf['program'].' -g '.$cf['config_dir'].' -r '.$cf['config_dir'].'/*.conf &> /dev/null');
+			
+			// remove existing ispconfig cronjobs, in case the syntax has changed
+			foreach($cron_jobs as $key => $val) {
+				if(stristr($val,$cf['program'])) unset($cron_jobs[$key]);
 			}
+			
+			foreach($cron_jobs as $cron_job) {
+				if(!in_array($cron_job."\n", $existing_cron_jobs)) {
+					$existing_cron_jobs[] = $cron_job."\n";
+				}
+			}
+			file_put_contents('crontab.txt', $existing_cron_jobs);
+			exec('crontab -u getmail crontab.txt &> /dev/null');
+			unlink('crontab.txt');
 		}
-		file_put_contents('crontab.txt', $existing_cron_jobs);
-		exec('crontab -u getmail crontab.txt &> /dev/null');
-		unlink('crontab.txt');
 	}
 
 }
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index e9a8dd866281b95bab0e750c07c45a88144f1d18..42ce9cc6a324d7b790ce566463b42c2cdb344d46 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -918,25 +918,27 @@ class installer_base {
 		unlink('crontab.txt');
 		
 		//* Getmail crontab
-        $cf = $conf['getmail'];
-		exec('crontab -u getmail -l > crontab.txt');
-		$existing_cron_jobs = file('crontab.txt');
+		if(is_user('getmail')) {
+        	$cf = $conf['getmail'];
+			exec('crontab -u getmail -l > crontab.txt');
+			$existing_cron_jobs = file('crontab.txt');
 		
-		$cron_jobs = array('*/5 * * * * '.$cf['program'].' -g '.$cf['config_dir'].' -r '.$cf['config_dir'].'/*.conf > /dev/null');
+			$cron_jobs = array('*/5 * * * * '.$cf['program'].' -g '.$cf['config_dir'].' -r '.$cf['config_dir'].'/*.conf > /dev/null');
 		
-		// remove existing ispconfig cronjobs, in case the syntax has changed
-		foreach($cron_jobs as $key => $val) {
-			if(stristr($val,$cf['program'])) unset($cron_jobs[$key]);
-		}
+			// remove existing ispconfig cronjobs, in case the syntax has changed
+			foreach($cron_jobs as $key => $val) {
+				if(stristr($val,$cf['program'])) unset($cron_jobs[$key]);
+			}
 		
-		foreach($cron_jobs as $cron_job) {
-			if(!in_array($cron_job."\n", $existing_cron_jobs)) {
-				$existing_cron_jobs[] = $cron_job."\n";
+			foreach($cron_jobs as $cron_job) {
+				if(!in_array($cron_job."\n", $existing_cron_jobs)) {
+					$existing_cron_jobs[] = $cron_job."\n";
+				}
 			}
+			file_put_contents('crontab.txt', $existing_cron_jobs);
+			exec('crontab -u getmail crontab.txt &> /dev/null');
+			unlink('crontab.txt');
 		}
-		file_put_contents('crontab.txt', $existing_cron_jobs);
-		exec('crontab -u getmail crontab.txt &> /dev/null');
-		unlink('crontab.txt');
 	}
 	
 }