diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index 1fb0a114b580a34a022aa7250bdb53d0070fa8de..87547601a390d74f4d79e3967af693ef98af00f4 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -664,8 +664,20 @@ class remoting_lib {
 			global $app,$sql1;
 			$username = $app->db->quote($params["username"]);
 			$password = $app->db->quote($params["password"]);
-			$modules = 'mail,sites,dns,tools';
-			$startmodule = 'mail';
+			if(!isset($params['modules'])) {
+				$modules = 'dashboard,mail,sites,dns,tools';
+			} else {
+				$modules = $app->db->quote($params['modules']);
+			}
+			if(!isset($params['startmodule'])) {			
+				$startmodule = 'dashboard';
+			} else {						
+				$startmodule = $app->db->quote($params["startmodule"]);
+				if(!preg_match('/'.$startmodule.'/',$modules)) {
+					$_modules = explode(',',$modules);
+					$startmodule=$_modules[0];
+				}
+			}
 			$usertheme = $app->db->quote($params["usertheme"]);
 			$type = 'user';
 			$active = 1;