diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
index 3222d2c8828acc934eda651c889c8e5d61cf6568..558a6bf42b2a1b466e741078bb84b0f99fdf8d18 100755
--- a/server/plugins-available/shelluser_base_plugin.inc.php
+++ b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -194,59 +194,60 @@ class shelluser_base_plugin {
 		
 	}
 	
-	function _setup_ssh_rsa() {
-			//global $app, $conf;
-			//$app->uses('system');
-			// Okay, here we have a question, .. how to determine the client id
-			//$var = "Var:".intval($this->app->system->getuid($this->data['new']['puser']));
-			//exec("echo $var >> /tmp/debug");
-			/*
-			// ssh-rsa authentication variables
-			$sshrsa = escapeshellcmd($this->data['new']['ssh_rsa']);
-			$usrdir = escapeshellcmd($this->data['new']['dir']);
-			$sshdir = escapeshellcmd($this->data['new']['dir']).'/.ssh';
-			$sshkeys= escapeshellcmd($this->data['new']['dir']).'/.ssh/authorized_keys';
-			
-			// determine the client id
-			$id = $this->data['new']['sys_groupid'];
-			if ($id>0) $id = $id -1;
-			
-			$user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE client_id  = ".$id);
-			$userkey = $user['ssh_rsa'];
-			$username= $user['username'];
-			
-			// If this user has no key yet, generate a pair
-			if ($userkey == '') 
-			{		
-				//Generate ssh-rsa-keys
-				exec('ssh-keygen -t rsa -C '.$username.'-rsa-key-'.time().' -f /tmp/id_rsa -N ""');
-				$app->db->query("UPDATE client SET created_at = ".time().", id_rsa = '".file_get_contents('/tmp/id_rsa')."', ssh_rsa = '".file_get_contents('/tmp/id_rsa.pub')."' WHERE client_id = ".$this->id;
-				exec('rm -f /tmp/id_rsa /tmp/id_rsa.pub');
-				
-				$this->app->log("ssh-rsa keypair generated for ".$username,LOGLEVEL_DEBUG);
-			
-			};
-			
-			if (!file_exists($sshkeys))
-			{
-				// add root's key
-				exec("mkdir '$sshdir'");
-				exec("cat /root/.ssh/authorized_keys > '$sshkeys'");
-				exec("echo '' >> '$sshkeys'");
-			
-				// add the user's key
-				exec("echo '$userkey' >> '$sshkeys'");
-				exec("echo '' >> '$sshkeys'");
-			}
+	private function _setup_ssh_rsa() {
+		$this->app->log("ssh-rsa setup shelluser_base",LOGLEVEL_DEBUG);
+		// Get the client ID, username, and the key
+		$domain_data = $this->app->dbmaster->queryOneRecord('SELECT sys_groupid FROM web_domain WHERE web_domain.domain_id = '.intval($this->data['new']['parent_domain_id']));
+		$sys_group_data = $this->app->dbmaster->queryOneRecord('SELECT * FROM sys_group WHERE sys_group.groupid = '.intval($domain_data['sys_groupid']));
+		$id = intval($sys_group_data['client_id']);
+		$username= $sys_group_data['name'];
+		$client_data = $this->app->dbmaster->queryOneRecord('SELECT * FROM client WHERE client.client_id = '.$id);
+		$userkey = $client_data['ssh_rsa'];
+		unset($domain_data);
+		unset($client_data);
+		
+		// ssh-rsa authentication variables
+		$sshrsa = escapeshellcmd($this->data['new']['ssh_rsa']);
+		$usrdir = escapeshellcmd($this->data['new']['dir']);
+		$sshdir = $usrdir.'/.ssh';
+		$sshkeys= $usrdir.'/.ssh/authorized_keys';
+		
+		// If this user has no key yet, generate a pair
+		if ($userkey == '' && $id>0) 
+		{
+			//Generate ssh-rsa-keys
+			exec('ssh-keygen -t rsa -C '.$username.'-rsa-key-'.time().' -f /tmp/id_rsa -N ""');
+			// save keypair in client table
+			$this->app->dbmaster->query("UPDATE client SET created_at = ".time().", id_rsa = '".file_get_contents('/tmp/id_rsa')."', ssh_rsa = '".file_get_contents('/tmp/id_rsa.pub')."' WHERE client_id = ".$id);
+			// and use the public key that has been generated
+			$userkey = file_get_contents('/tmp/id_rsa.pub')
+			;
+			exec('rm -f /tmp/id_rsa /tmp/id_rsa.pub');
+			$this->app->log("ssh-rsa keypair generated for ".$username,LOGLEVEL_DEBUG);
+		};
+		
+		if (!file_exists($sshkeys))
+		{
+			// add root's key
+			exec("mkdir '$sshdir'");
+			exec("cat /root/.ssh/authorized_keys > '$sshkeys'");
+			exec("echo '' >> '$sshkeys'");
+		
+			// add the user's key
+			exec("echo '$userkey' >> '$sshkeys'");
+			exec("echo '' >> '$sshkeys'");
+			$this->app->log("ssh-rsa authorisation keyfile created in ".$sshkeys,LOGLEVEL_DEBUG);
+		}
+		if ($sshrsa!=''){
 			// add the custom key 
 			exec("echo '$sshrsa' >> '$sshkeys'");
 			exec("echo '' >> '$sshkeys'");
-			
-			// set proper file permissions
-			exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$usrdir);
-			exec("chmod 600 '$sshkeys'");
-			*/
-			$this->app->log("ssh-rsa key added to ".$sshkeys,LOGLEVEL_DEBUG);
+			$this->app->log("ssh-rsa key updated in ".$sshkeys,LOGLEVEL_DEBUG);
+		}
+		// set proper file permissions
+		exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$usrdir);
+		exec("chmod 600 '$sshkeys'");
+		
 	}
 	
 
diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
index ffe94fa31ffe94ff79c009abf3cd0a2663083b2f..050ec00617133ad7f57c8b1bedb22305b6b60163 100755
--- a/server/plugins-available/shelluser_jailkit_plugin.inc.php
+++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -91,6 +91,9 @@ class shelluser_jailkit_plugin {
 				
 				$this->_add_jailkit_user();
 				
+				// call the ssh-rsa update function
+				$this->_setup_ssh_rsa();
+				
 				$command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
 				exec($command);
 				
@@ -129,6 +132,9 @@ class shelluser_jailkit_plugin {
 				$this->_setup_jailkit_chroot();
 				$this->_add_jailkit_user();
 				
+				// call the ssh-rsa update function
+				$this->_setup_ssh_rsa();
+				
 				$this->_update_website_security_level();
 			}
 		
@@ -272,6 +278,7 @@ class shelluser_jailkit_plugin {
 			chgrp(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['pgroup']);
 				
 			$this->app->log("Added created jailkit parent user home in : ".$this->data['new']['dir'].$jailkit_chroot_puserhome,LOGLEVEL_DEBUG);
+			
 			/*
 			// ssh-rsa authentication variables
 			$sshrsa = escapeshellcmd($this->data['new']['ssh_rsa']);
@@ -356,6 +363,61 @@ class shelluser_jailkit_plugin {
 		exec($command);
 	}
 
+	private function _setup_ssh_rsa() {
+		$this->app->log("ssh-rsa setup shelluser_jailkit",LOGLEVEL_DEBUG); 
+		// Get the client ID, username, and the key
+		$domain_data = $this->app->dbmaster->queryOneRecord('SELECT sys_groupid FROM web_domain WHERE web_domain.domain_id = '.intval($this->data['new']['parent_domain_id']));
+		$sys_group_data = $this->app->dbmaster->queryOneRecord('SELECT * FROM sys_group WHERE sys_group.groupid = '.intval($domain_data['sys_groupid']));
+		$id = intval($sys_group_data['client_id']);
+		$username= $sys_group_data['name'];
+		$client_data = $this->app->dbmaster->queryOneRecord('SELECT * FROM client WHERE client.client_id = '.$id);
+		$userkey = $client_data['ssh_rsa'];
+		unset($domain_data);
+		unset($client_data);
+		
+		// ssh-rsa authentication variables
+		$sshrsa = escapeshellcmd($this->data['new']['ssh_rsa']);
+		$usrdir = escapeshellcmd($this->data['new']['dir']).'/'.$this->_get_home_dir($this->data['new']['username']);
+			$sshdir = $usrdir.'/.ssh';
+			$sshkeys= $usrdir.'/.ssh/authorized_keys';
+		
+		// If this user has no key yet, generate a pair
+		if ($userkey == '' && $id>0) 
+		{
+			//Generate ssh-rsa-keys
+			exec('ssh-keygen -t rsa -C '.$username.'-rsa-key-'.time().' -f /tmp/id_rsa -N ""');
+			// save keypair in client table
+			$this->app->dbmaster->query("UPDATE client SET created_at = ".time().", id_rsa = '".file_get_contents('/tmp/id_rsa')."', ssh_rsa = '".file_get_contents('/tmp/id_rsa.pub')."' WHERE client_id = ".$id);
+			// and use the public key that has been generated
+			$userkey = file_get_contents('/tmp/id_rsa.pub')
+			;
+			exec('rm -f /tmp/id_rsa /tmp/id_rsa.pub');
+			$this->app->log("ssh-rsa keypair generated for ".$username,LOGLEVEL_DEBUG);
+		};
+		
+		if (!file_exists($sshkeys))
+		{
+			// add root's key
+			exec("mkdir '$sshdir'");
+			exec("cat /root/.ssh/authorized_keys > '$sshkeys'");
+			exec("echo '' >> '$sshkeys'");
+		
+			// add the user's key
+			exec("echo '$userkey' >> '$sshkeys'");
+			exec("echo '' >> '$sshkeys'");
+			$this->app->log("ssh-rsa authorisation keyfile created in ".$sshkeys,LOGLEVEL_DEBUG);
+		}
+		if ($sshrsa!=''){
+			// add the custom key 
+			exec("echo '$sshrsa' >> '$sshkeys'");
+			exec("echo '' >> '$sshkeys'");
+			$this->app->log("ssh-rsa key updated in ".$sshkeys,LOGLEVEL_DEBUG);
+		}
+		// set proper file permissions
+		exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$usrdir);
+		exec("chmod 600 '$sshkeys'");
+		
+	}
 } // end class
 
 ?>