diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index f4f48c341f81d5ff1e03c5271526048fac8f57dc..1f2e8572a1f425afd86aaef73bedea373a03d73b 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -1056,6 +1056,9 @@ class installer_dist extends installer_base {
 			exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices'));
 		}
 		
+		//* Remove Domain module as its functions are available in the client module now
+		if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
+		
 	}
 	
 	public function configure_dbserver()
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index 3634b844ca7c27db4a8ca12f99c301b9a7ff0d84..b08a05f4b860cf98e8b63b0e1ec00dba72a3a36b 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -1038,6 +1038,10 @@ class installer extends installer_base
 			chown('/usr/local/bin/run-getmail.sh', 'getmail');
 		}
 		chmod('/usr/local/bin/run-getmail.sh', 0744);
+		
+		//* Remove Domain module as its functions are available in the client module now
+		if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
+		
     }
 }
 
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 19089aea25706d1d360c345adf3e116e89198296..f33fc84642f393fc41dbdff8c7a1cd212e9c8f7b 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -1098,6 +1098,9 @@ class installer_dist extends installer_base {
 			exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices'));
 		}
 		
+		//* Remove Domain module as its functions are available in the client module now
+		if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
+		
 		
 	}
 	
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index dd55a5493acecbf42d65f1bbc5ae3704b46c093f..9fec15855916f27cf867c2c9122f79975bc5254d 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1995,6 +1995,11 @@ class installer_base {
 			fclose($fh);
 			*/
 		}
+		
+		//* Remove Domain module as its functions are available in the client module now
+		if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
+	
+	
 	}
 
 	public function configure_dbserver() {
diff --git a/install/sql/incremental/upd_0040.sql b/install/sql/incremental/upd_0040.sql
new file mode 100644
index 0000000000000000000000000000000000000000..d613681f184c478c4f77806d9cc9e36ed5729fe1
--- /dev/null
+++ b/install/sql/incremental/upd_0040.sql
@@ -0,0 +1,4 @@
+
+-- Removal of the domain module
+UPDATE sys_user SET startmodule = 'dashboard' WHERE startmodule = 'domain';
+UPDATE sys_user SET modules = replace(modules, ',domain', '') WHERE modules like '%domain%';