diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index 5da71107e0b232e80d06bc59e8bb928bd5c0d044..0cee48a6abfb11659fca85a699a8fd3fd0d53010 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -143,7 +143,7 @@ class page_action extends tform_actions {
 		$password = $app->db->quote($this->dataRecord["password"]);
 		$modules = $conf['interface_modules_enabled'];
 		if($this->dataRecord["limit_client"] > 0) $modules .= ',client';
-		$startmodule = 'mail';
+		$startmodule = (stristr($modules,'dashboard'))?'dashboard':'client';
 		$usertheme = $app->db->quote($this->dataRecord["usertheme"]);
 		$type = 'user';
 		$active = 1;
diff --git a/interface/web/client/reseller_edit.php b/interface/web/client/reseller_edit.php
index 747c92439a54e7e7db1103725035d72f8a445620..1c9a2a1aad8575ea94d9140661b1630f2c806488 100644
--- a/interface/web/client/reseller_edit.php
+++ b/interface/web/client/reseller_edit.php
@@ -144,7 +144,7 @@ class page_action extends tform_actions {
 		$username = $app->db->quote($this->dataRecord["username"]);
 		$password = $app->db->quote($this->dataRecord["password"]);
 		$modules = $conf['interface_modules_enabled'] . ',client';
-		$startmodule = 'client';
+		$startmodule = (stristr($modules,'dashboard'))?'dashboard':'client'; 
 		$usertheme = $app->db->quote($this->dataRecord["usertheme"]);
 		$type = 'user';
 		$active = 1;