diff --git a/interface/lib/classes/validate_domain.inc.php b/interface/lib/classes/validate_domain.inc.php
index b4acbd6db136449cb967aa46602684a13ea0188b..fde14b0010a2af2b825cc1fb2bb1fd3f66bd9e5d 100644
--- a/interface/lib/classes/validate_domain.inc.php
+++ b/interface/lib/classes/validate_domain.inc.php
@@ -158,6 +158,10 @@ class validate_domain {
 		if($domain['ip_address'] == '' || $domain['ipv6_address'] == ''){
 			if($domain['parent_domain_id'] > 0){
 				$parent_domain = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $domain['parent_domain_id']);
+				if(is_array($parent_domain) && !empty($parent_domain)){
+					$domain['ip_address'] = $parent_domain['ip_address'];
+					$domain['ipv6_address'] = $parent_domain['ipv6_address'];
+				}
 			}
 		}
 
diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
index 0897a84981c36c4c84469ec777c042d3717b2416..a0ae9a51f1eec6e3fb54a115627cb34a72ec3aef 100755
--- a/server/plugins-available/shelluser_base_plugin.inc.php
+++ b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -96,6 +96,8 @@ class shelluser_base_plugin {
 			return false;
 		}
 
+		if($data['new']['active'] != 'y') $data['new']['shell'] = '/bin/false';
+		
 		if($app->system->is_user($data['new']['puser'])) {
 
 			// Get the UID of the parent user
@@ -194,6 +196,8 @@ class shelluser_base_plugin {
 			return false;
 		}
 		
+		if($data['new']['active'] != 'y') $data['new']['shell'] = '/bin/false';
+		
 		if($app->system->is_user($data['new']['puser'])) {
 			// Get the UID of the parent user
 			$uid = intval($app->system->getuid($data['new']['puser']));